Author: jfrederic.clere(a)jboss.com Date: 2014-05-14 08:35:25 -0400 (Wed, 14 May 2014) New Revision: 3291 Modified: trunk/build/unix/buildbin.TC8.sh Log: Fix authentication and SSL certificates. Modified: trunk/build/unix/buildbin.TC8.sh =================================================================== --- trunk/build/unix/buildbin.TC8.sh 2014-05-13 15:56:32 UTC (rev 3290) +++ trunk/build/unix/buildbin.TC8.sh 2014-05-14 12:35:25 UTC (rev 3291) @@ -87,6 +87,29 @@ mkdir $native_sources/output/build/logs mkdir $native_sources/output/build/webapps +#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="javajoe" password="javajoe" roles="Employee,Manager,javajoe,Guest,guest,VP" /> +<user username="javaee" password="javaee" roles="javaee,guest" /> +<user username="j2ee" password="j2ee" roles="Employee,j2ee,Guest,guest,Administrator" /> + +</tomcat-users> +EOF + #installing export TS_HOME=/home/hudson/TCK7/javaeetck export ANT_HOME=$TS_HOME/tools/ant @@ -120,7 +143,7 @@ echo "Running TCK tests..." echo "SERVLETS" echo "" -cp $TS_HOME/bin/ts.jte.tc8 $TS_HOME/bin/ts.jte +sed s:@CATALINA@:$native_sources: $TS_HOME/bin/ts.jte.tc8 > $TS_HOME/bin/ts.jte (cd $RID; ant runclient || exit 1) if [ $? -ne 0 ]; then echo "Failed test failed..."