Author: jfrederic.clere(a)jboss.com
Date: 2014-05-19 12:22:03 -0400 (Mon, 19 May 2014)
New Revision: 3305
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
Arrange logic.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-19 15:52:43 UTC (rev 3304)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-19 16:22:03 UTC (rev 3305)
@@ -85,18 +85,43 @@
echo ""
echo "Running TCK tests"
rm -rf /tmp/JTWork
-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
+#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
EOF
+
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
+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
+
WDIR=/home/hudson/TCK7/javaeetck/dist/com/sun/ts/tests/websocket
for file in `find $WDIR -name *.war`
do