JBoss Native SVN: r3301 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-19 08:03:37 -0400 (Mon, 19 May 2014)
New Revision: 3301
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
Remve the work directory...
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-19 10:39:24 UTC (rev 3300)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-19 12:03:37 UTC (rev 3301)
@@ -84,6 +84,7 @@
echo "Ant test Done"
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)
11 years, 10 months
JBoss Native SVN: r3300 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-19 06:39:24 -0400 (Mon, 19 May 2014)
New Revision: 3300
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
Add websocket tests.
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-16 07:40:10 UTC (rev 3299)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-19 10:39:24 UTC (rev 3300)
@@ -96,7 +96,23 @@
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
+WDIR=/home/hudson/TCK7/javaeetck/dist/com/sun/ts/tests/websocket
+for file in `find $WDIR -name *.war`
+do
+ FILE=`basename $file`
+ rm -rf TMP
+ mkdir TMP
+ cd TMP
+ jar xvf $file
+ rm META-INF/MANIFEST.MF
+ jar cvf $FILE *
+ cp $FILE $native_sources/output/build/webapps
+ cd -
+done
+
# Starting tomcat...
+JAVA_HOME=$JAVA6_HOME
+export JAVA_HOME
rm -rf $native_sources/output/build/work
rm -rf $native_sources/output/build/logs
mkdir $native_sources/output/build/logs
@@ -135,12 +151,48 @@
stopTomcat
exit 1
fi
+
echo ""
echo "Stopping TC7..."
echo ""
stopTomcat
+echo "WEBSOCKET TCK7"
echo ""
+JAVA_HOME=$JAVA7_HOME
+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
+WRID=$TS_HOME/src/com/sun/ts/tests/websocket
+
+# wait for TC7 to stop and restart.
+sleep 20
+(cd $native_sources/output/build; bin/startup.sh)
+echo ""
+echo "Waiting for Tomcat to start"
+sleep 20
+
+(cd $WRID; ant runclient || exit 1)
+if [ $? -ne 0 ]; then
+ echo "Failed test failed..."
+ stopTomcat
+ exit 1
+else
+ (cd $WRID; ant report || exit 1)
+ if [ $? -ne 0 ]; then
+ echo "Failed build test report failed..."
+ stopTomcat
+ exit 1
+ fi
+fi
+
+echo ""
+echo "Stopping TC7..."
+echo ""
+stopTomcat
+
+echo ""
echo "Testing with native"
echo ""
# find the native we need to download for the tests.
11 years, 10 months
JBoss Native SVN: r3299 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: mbabacek
Date: 2014-05-16 03:40:10 -0400 (Fri, 16 May 2014)
New Revision: 3299
Modified:
trunk/build/unix/package.list
Log:
Ah O.K. config.m4.2.4.patch and other stuff for Apache HTTP Server 2.4.x is missing in 1.2.x m_c branch. Building with Apache 2.2.21 instead.
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2014-05-16 07:08:26 UTC (rev 3298)
+++ trunk/build/unix/package.list 2014-05-16 07:40:10 UTC (rev 3299)
@@ -70,7 +70,7 @@
mod_cluster|1.3.0.Final|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:1.3.0.Final
mod_cluster|1.2.8.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x
mod_cluster|1.3.1.dev|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:master
-mod_cluster|1.2.8.Final|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:1.2.8.Final
+mod_cluster|1.2.8.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.8.Final
traffic_server|TS_Trunk|trunk
TC8|TC8_Trunk|trunk
TC7|TC7_Trunk|trunk
11 years, 11 months
JBoss Native SVN: r3298 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: mbabacek
Date: 2014-05-16 03:08:26 -0400 (Fri, 16 May 2014)
New Revision: 3298
Modified:
trunk/build/unix/build.sh
trunk/build/unix/package.list
Log:
CFLAGS="${CFLAGS} -O2" and 1.2.8.Final with the new httpd 2.4.7.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2014-05-15 14:59:32 UTC (rev 3297)
+++ trunk/build/unix/build.sh 2014-05-16 07:08:26 UTC (rev 3298)
@@ -501,6 +501,10 @@
echo "Building 32 bits version"
fi
+# Is this a wrong place to do this? :-/
+CFLAGS="${CFLAGS} -O2"
+export CFLAGS
+
export has_jk
export has_cluster
export so_extension
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2014-05-15 14:59:32 UTC (rev 3297)
+++ trunk/build/unix/package.list 2014-05-16 07:08:26 UTC (rev 3298)
@@ -70,6 +70,7 @@
mod_cluster|1.3.0.Final|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:1.3.0.Final
mod_cluster|1.2.8.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x
mod_cluster|1.3.1.dev|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:master
+mod_cluster|1.2.8.Final|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:1.2.8.Final
traffic_server|TS_Trunk|trunk
TC8|TC8_Trunk|trunk
TC7|TC7_Trunk|trunk
11 years, 11 months
JBoss Native SVN: r3297 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-15 10:59:32 -0400 (Thu, 15 May 2014)
New Revision: 3297
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
rollback r3294 cc & ld are too broken on our boxes.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 11:42:21 UTC (rev 3296)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 14:59:32 UTC (rev 3297)
@@ -153,7 +153,7 @@
add_conf_sys="$add_conf_sys --enable-pie"
;;
hpux*)
- add_conf_sys="$add_conf_sys --enable-shared --without-pgsql"
+ add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql"
;;
esac
case ${BUILD_CPU} in
11 years, 11 months
JBoss Native SVN: r3296 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-15 07:42:21 -0400 (Thu, 15 May 2014)
New Revision: 3296
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
copy the .so and .sl file (only the .sl are renamed).
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 11:29:07 UTC (rev 3295)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 11:42:21 UTC (rev 3296)
@@ -414,17 +414,13 @@
./configure --with-apxs=${BASELOC}/opt/jboss/httpd/${apxs}
make clean
make
- if [ "$BUILD_SYS" = "hpux" ]; then
- for file in `ls *.sl`
- do
- nfile=`echo $file | sed 's:\.sl:\.so:'`
- cp -p $file ../../target/$nfile
- echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile"
- cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile
- done
- else
- cp *.so ../../target
- fi
+ for file in `ls *.sl *.so`
+ do
+ nfile=`echo $file | sed 's:\.sl:\.so:'`
+ cp -p $file ../../target/$nfile
+ echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile"
+ cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile
+ done
) || exit 1
done
(cd ../mod_cluster/target
11 years, 11 months
JBoss Native SVN: r3295 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-15 07:29:07 -0400 (Thu, 15 May 2014)
New Revision: 3295
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
worker fails otherwise (building mod_ssl).
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 10:07:42 UTC (rev 3294)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 11:29:07 UTC (rev 3295)
@@ -196,7 +196,13 @@
# --enable-modules=none doesn't work... No problem the build takes just more time.
mpmbuild worker \
--enable-mods-shared=all \
- --enable-modules=none ${add_conf_sys}
+ ${add_conf} \
+ ${add_conf_sys} \
+ --enable-proxy \
+ --enable-cache --enable-mem-cache \
+ --enable-file-cache --enable-disk-cache \
+ --enable-cgid \
+ --enable-authn-anon --enable-authn-alias
if [ $? -ne 0 ]; then
echo "mpmbuild worker failed"
exit 1
11 years, 11 months
JBoss Native SVN: r3294 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-15 06:07:42 -0400 (Thu, 15 May 2014)
New Revision: 3294
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
The experimental libtool looks broken...
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 08:23:16 UTC (rev 3293)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2014-05-15 10:07:42 UTC (rev 3294)
@@ -153,7 +153,7 @@
add_conf_sys="$add_conf_sys --enable-pie"
;;
hpux*)
- add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql"
+ add_conf_sys="$add_conf_sys --enable-shared --without-pgsql"
;;
esac
case ${BUILD_CPU} in
11 years, 11 months
JBoss Native SVN: r3293 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-15 04:23:16 -0400 (Thu, 15 May 2014)
New Revision: 3293
Modified:
trunk/build/unix/package.list
Log:
remove mod_jk.
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2014-05-15 07:12:35 UTC (rev 3292)
+++ trunk/build/unix/package.list 2014-05-15 08:23:16 UTC (rev 3293)
@@ -69,7 +69,7 @@
mod_cluster|1.2.6.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|icon...
mod_cluster|1.3.0.Final|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:1.3.0.Final
mod_cluster|1.2.8.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x
-mod_cluster|1.3.1.dev|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:master
+mod_cluster|1.3.1.dev|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:master
traffic_server|TS_Trunk|trunk
TC8|TC8_Trunk|trunk
TC7|TC7_Trunk|trunk
11 years, 11 months
JBoss Native SVN: r3292 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-15 03:12:35 -0400 (Thu, 15 May 2014)
New Revision: 3292
Modified:
trunk/build/unix/build.sh
Log:
the bakcup URL shouldn't be empty on Solaris.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2014-05-14 12:35:25 UTC (rev 3291)
+++ trunk/build/unix/build.sh 2014-05-15 07:12:35 UTC (rev 3292)
@@ -1292,7 +1292,7 @@
checkdownload pcre ${pcre_version} $PCREURL "NONE"
fi
if $has_iconv; then
- checkdownload iconv ${iconv_version} $ICONVURL $ICONVURLBACK
+ checkdownload iconv ${iconv_version} $ICONVURL "NONE"
fi
# Note: type of the download (r: rhel, v: internet, t: tag in svn).
if $has_openssl; then
11 years, 11 months