Author: jfrederic.clere(a)jboss.com Date: 2014-05-19 11:28:25 -0400 (Mon, 19 May 2014) New Revision: 3302 Modified: trunk/build/unix/buildbin.TC6.sh Log: Ajust the TCK... Modified: trunk/build/unix/buildbin.TC6.sh =================================================================== --- trunk/build/unix/buildbin.TC6.sh 2014-05-19 12:03:37 UTC (rev 3301) +++ trunk/build/unix/buildbin.TC6.sh 2014-05-19 15:28:25 UTC (rev 3302) @@ -73,11 +73,32 @@ stopTomcat echo "Running TCK tests" -cp $HOME/tcks/conf/* $native_sources/output/build/conf -(cd $HOME/tcks/servlet; bash install.sh $native_sources/output/build) -(cd $HOME/tcks/jsp; bash install.sh $native_sources/output/build) -sed "/@SSL_CONNECTOR@/r $HOME/tcks/conf/server.xml.jce" $HOME/tcks/conf/server.xml | sed "/@SSL_CONNECTOR@/d" > $native_sources/output/build/conf/server.xml +rm -rf $native_sources/output/build/work +rm -rf $native_sources/output/build/logs +mkdir $native_sources/output/build/logs + +#configuring +cat << EOF > $$.xml + <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" + maxThreads="150" scheme="https" secure="true" + clientAuth="false" sslProtocol="TLS" + keystoreFile="/home/hudson/TCK7/javaeetck/bin/certificates/clientcert.jks" + keystorePass="changeit" + truststoreFile="/home/hudson/TCK7/javaeetck/jee7tck-as7-mods/etc/security/keystores/tomcat.keystore" + truststorePass="rmi+ssl" /> +EOF +sed "/protocol=\"AJP/r $$.xml" $native_sources/output/build/conf/server.xml > $$.tmp +cp -p $$.tmp native_sources/output/build/conf/server.xml + +cat << EOF > $native_sources/output/build/conf/tomcat-users.xml +<tomcat-users> +<user username="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator"/> +<user username="j2ee" password="j2ee" roles="Administrator,Employee" /> +<user username="javajoe" password="javajoe" roles="VP" /> +</tomcat-users> +EOF + 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 -Dsun.security.ssl.allowUnsafeRenegotiation=true" export JAVA_OPTS @@ -85,16 +106,18 @@ sed "/org.apache.jasper.servlet.JspServlet/r $HOME/tcks/conf/web.xml.jsp" $native_sources/output/build/conf/web.xml > $$.xml mv $$.xml $native_sources/output/build/conf/web.xml -# Starting tomcat... -rm -rf $native_sources/output/build/work -rm -rf $native_sources/output/build/logs -mkdir $native_sources/output/build/logs -export TS_HOME=/home/hudson/tcks6/2.5/servlettck +cat <<EOF > $native_sources/output/build/conf/context.xml +<?xml version='1.0' encoding='utf-8'?> +<Context tldValidation="false"> + <WatchedResource>WEB-INF/web.xml</WatchedResource> +</Context> +EOF echo "" echo "Copy the wars" echo "" +export TS_HOME=/home/hudson/TCK5/servlet/servlettck (cd $TS_HOME for file in `find . -name "*war"` do @@ -102,6 +125,16 @@ done ) +export TS_HOME=/home/hudson/TCK5/jsp/jsptck/ +(cd $TS_HOME +for file in `find . -name "*war"` +do + cp $file $native_sources/output/build/webapps +done +) + +# Starting tomcat... + (cd $native_sources/output/build; bin/startup.sh) echo "" echo "Waiting for Tomcat to start" @@ -111,6 +144,8 @@ echo "SERVLETS" echo "" +export TS_HOME=/home/hudson/TCK5/servlet/servlettck +export ANT_HOME=$TS_HOME/tools/ant (cd $TS_HOME; bin/tsant runclient || exit 1) if [ $? -ne 0 ];then stopTomcat @@ -119,7 +154,7 @@ echo "JSP" -export TS_HOME=/home/hudson/tcks6/2.1/jsptck +export TS_HOME=/home/hudson/TCK5/jsp/jsptck/ export ANT_HOME=$TS_HOME/tools/ant (cd $TS_HOME; bin/tsant runclient || exit 1) if [ $? -ne 0 ];then @@ -188,7 +223,7 @@ echo "Running TCK tests..." echo "SERVLETS" echo "" -export TS_HOME=/home/hudson/tcks6/2.5/servlettck +export TS_HOME=/home/hudson/TCK5/servlet/servlettck (cd $TS_HOME; bin/tsant runclient || exit 1) if [ $? -ne 0 ]; then echo "Failed test failed..."