JBoss Native SVN: r3311 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-21 03:57:25 -0400 (Wed, 21 May 2014)
New Revision: 3311
Modified:
trunk/build/unix/buildbin.TC6.sh
Log:
Configure for the r1579251 new paramter.
Modified: trunk/build/unix/buildbin.TC6.sh
===================================================================
--- trunk/build/unix/buildbin.TC6.sh 2014-05-20 15:13:37 UTC (rev 3310)
+++ trunk/build/unix/buildbin.TC6.sh 2014-05-21 07:57:25 UTC (rev 3311)
@@ -108,7 +108,7 @@
cat <<EOF > $native_sources/output/build/conf/context.xml
<?xml version='1.0' encoding='utf-8'?>
-<Context tldValidation="false" crossContext="true">
+<Context tldValidation="false" crossContext="true" xmlValidation="false">
<WatchedResource>WEB-INF/web.xml</WatchedResource>
</Context>
EOF
10 years
JBoss Native SVN: r3310 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-20 11:13:37 -0400 (Tue, 20 May 2014)
New Revision: 3310
Modified:
trunk/build/unix/buildbin.TC6.sh
Log:
Add crosscontext.
Modified: trunk/build/unix/buildbin.TC6.sh
===================================================================
--- trunk/build/unix/buildbin.TC6.sh 2014-05-20 12:07:04 UTC (rev 3309)
+++ trunk/build/unix/buildbin.TC6.sh 2014-05-20 15:13:37 UTC (rev 3310)
@@ -108,7 +108,7 @@
cat <<EOF > $native_sources/output/build/conf/context.xml
<?xml version='1.0' encoding='utf-8'?>
-<Context tldValidation="false">
+<Context tldValidation="false" crossContext="true">
<WatchedResource>WEB-INF/web.xml</WatchedResource>
</Context>
EOF
10 years
JBoss Native SVN: r3309 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-20 08:07:04 -0400 (Tue, 20 May 2014)
New Revision: 3309
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
make sure to build the websocket jars.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-20 10:39:29 UTC (rev 3308)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-20 12:07:04 UTC (rev 3309)
@@ -65,13 +65,20 @@
native_sources=srclib/`ls srclib | grep TC7`
native_sources=`(cd $native_sources; pwd)`
cd $native_sources
-JAVA_7_HOME=$JAVA_HOME
+
JAVA_HOME=$JAVA6_HOME
+export JAVA_HOME
+echo ""
echo "Using $JAVA_HOME for ant build-tomcat-dbcp"
+echo ""
ant build-tomcat-dbcp || exit 1
+
JAVA_HOME=$JAVA_7_HOME
+export JAVA_HOME
+echo ""
echo "Using $JAVA_HOME for ant"
-ant || exit 1
+echo ""
+ant -Djava.7.home=$JAVA7_HOME || exit 1
echo ""
echo "Stopping tomcat (just in case)"
10 years
JBoss Native SVN: r3308 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-20 06:39:29 -0400 (Tue, 20 May 2014)
New Revision: 3308
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
It seems the crossContext was missing.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-20 09:35:34 UTC (rev 3307)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-20 10:39:29 UTC (rev 3308)
@@ -117,7 +117,7 @@
cat <<EOF > $native_sources/output/build/conf/context.xml
<?xml version='1.0' encoding='utf-8'?>
-<Context tldValidation="false">
+<Context tldValidation="false" crossContext="true">
<WatchedResource>WEB-INF/web.xml</WatchedResource>
</Context>
EOF
10 years
JBoss Native SVN: r3307 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-20 05:35:34 -0400 (Tue, 20 May 2014)
New Revision: 3307
Modified:
trunk/build/unix/buildbin.TC8.sh
Log:
use standalone servlet.
Modified: trunk/build/unix/buildbin.TC8.sh
===================================================================
--- trunk/build/unix/buildbin.TC8.sh 2014-05-20 07:33:07 UTC (rev 3306)
+++ trunk/build/unix/buildbin.TC8.sh 2014-05-20 09:35:34 UTC (rev 3307)
@@ -111,7 +111,7 @@
EOF
#installing
-export TS_HOME=/home/hudson/TCK7/javaeetck
+export TS_HOME=/home/hudson/TCK7/servlet/servlettck
export ANT_HOME=$TS_HOME/tools/ant
DIR=$TS_HOME/dist/com/sun/ts/tests/servlet
RID=$TS_HOME/src/com/sun/ts/tests/servlet
@@ -143,7 +143,7 @@
echo "Running TCK tests..."
echo "SERVLETS"
echo ""
-sed s:@CATALINA@:$native_sources: $TS_HOME/bin/ts.jte.tc8 > $TS_HOME/bin/ts.jte
+sed s:@CATALINA@:$native_sources/output/bin: $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..."
10 years
JBoss Native SVN: r3306 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-20 03:33:07 -0400 (Tue, 20 May 2014)
New Revision: 3306
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
Add missing wars.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-19 16:22:03 UTC (rev 3305)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-20 07:33:07 UTC (rev 3306)
@@ -123,6 +123,7 @@
EOF
WDIR=/home/hudson/TCK7/javaeetck/dist/com/sun/ts/tests/websocket
+echo "Copy the wars from $WDIR"
for file in `find $WDIR -name *.war`
do
FILE=`basename $file`
@@ -136,6 +137,19 @@
cd -
done
+WDIR=/home/hudson/tcks/servlet/servlettck
+echo "Copy the wars from $WDIR"
+for file in `find $WDIR -name *.war`
+do
+ cp $file $native_sources/output/build/webapps
+done
+
+WDIR=/home/hudson/tcks/jsp/jsptck
+for file in `find $WDIR -name *.war`
+do
+ cp $file $native_sources/output/build/webapps
+done
+
# Starting tomcat...
JAVA_HOME=$JAVA6_HOME
export JAVA_HOME
@@ -193,7 +207,7 @@
export JAVA_HOME
export TS_HOME=/home/hudson/TCK7/javaeetck
export ANT_HOME=$TS_HOME/tools/ant
-cp $TS_HOME/bin/ts.jte.eap6 $TS_HOME/bin/ts.jte
+cp $TS_HOME/bin/ts.jte.tc7 $TS_HOME/bin/ts.jte
WRID=$TS_HOME/src/com/sun/ts/tests/websocket
# wait for TC7 to stop and restart.
10 years
JBoss Native SVN: r3305 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
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
10 years
JBoss Native SVN: r3304 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-19 11:52:43 -0400 (Mon, 19 May 2014)
New Revision: 3304
Modified:
trunk/build/unix/buildbin.TC6.sh
trunk/build/unix/buildbin.TC8.sh
Log:
typo.
Modified: trunk/build/unix/buildbin.TC6.sh
===================================================================
--- trunk/build/unix/buildbin.TC6.sh 2014-05-19 15:44:31 UTC (rev 3303)
+++ trunk/build/unix/buildbin.TC6.sh 2014-05-19 15:52:43 UTC (rev 3304)
@@ -89,7 +89,7 @@
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
+cp -p $$.tmp $native_sources/output/build/conf/server.xml
cat << EOF > $native_sources/output/build/conf/tomcat-users.xml
<tomcat-users>
Modified: trunk/build/unix/buildbin.TC8.sh
===================================================================
--- trunk/build/unix/buildbin.TC8.sh 2014-05-19 15:44:31 UTC (rev 3303)
+++ trunk/build/unix/buildbin.TC8.sh 2014-05-19 15:52:43 UTC (rev 3304)
@@ -98,7 +98,7 @@
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
+cp -p $$.tmp $native_sources/output/build/conf/server.xml
cat << EOF > $native_sources/output/build/conf/tomcat-users.xml
<tomcat-users>
10 years
JBoss Native SVN: r3303 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-19 11:44:31 -0400 (Mon, 19 May 2014)
New Revision: 3303
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
Don't stop is test fails.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-19 15:28:25 UTC (rev 3302)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-19 15:44:31 UTC (rev 3303)
@@ -129,13 +129,15 @@
export ANT_HOME=$TS_HOME/tools/ant
(cd $TS_HOME/bin; ant run.all || exit 1)
if [ $? -ne 0 ];then
- stopTomcat
- exit 1
+ echo "SERVLETS failed"
+ #stopTomcat
+ #exit 1
fi
(cd $TS_HOME/bin; ant report || exit 1)
if [ $? -ne 0 ];then
- stopTomcat
- exit 1
+ echo "SERVLETS report failed"
+ #stopTomcat
+ #exit 1
fi
echo "JSP"
@@ -144,13 +146,15 @@
export ANT_HOME=$TS_HOME/tools/ant
(cd $TS_HOME/bin; ant run.all || exit 1)
if [ $? -ne 0 ];then
- stopTomcat
- exit 1
+ echo "JSP failed"
+ #stopTomcat
+ #exit 1
fi
(cd $TS_HOME/bin; ant report || exit 1)
if [ $? -ne 0 ];then
- stopTomcat
- exit 1
+ echo "JSP report failed"
+ #stopTomcat
+ #exit 1
fi
echo ""
10 years
JBoss Native SVN: r3302 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
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..."
10 years