jbossnative-commits August 2011

jbossnative-commits@lists.jboss.org

1 participants
15 discussions

JBoss Native SVN: r2845 - trunk/site-jbossweb.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2011-08-11 03:58:30 -0400 (Thu, 11 Aug 2011) New Revision: 2845 Modified: trunk/site-jbossweb/files.list trunk/site-jbossweb/files.sh Log: Arrange file lists. Modified: trunk/site-jbossweb/files.list =================================================================== --- trunk/site-jbossweb/files.list 2011-08-11 07:21:46 UTC (rev 2844) +++ trunk/site-jbossweb/files.list 2011-08-11 07:58:30 UTC (rev 2845) @@ -10,12 +10,12 @@ jboss-native-2.0.4-linux2-x64.tar.gz jboss-native-2.0.4-linux2-x86-ssl.tar.gz jboss-native-2.0.4-linux2-x86.tar.gz -jboss-native-2.0.4-solaris-sparcv9-ssl.tar.gz -jboss-native-2.0.4-solaris-sparcv9.tar.gz -jboss-native-2.0.4-solaris-x86-ssl.tar.gz -jboss-native-2.0.4-solaris-x86.tar.gz -jboss-native-2.0.4-solaris-sun4v-ssl.tar.gz -jboss-native-2.0.4-solaris-sun4v.tar.gz +jboss-native-2.0.4-solaris9-sparcv9-ssl.tar.gz +jboss-native-2.0.4-solaris9-sparcv9.tar.gz +jboss-native-2.0.4-solaris10-x64-ssl.tar.gz +jboss-native-2.0.4-solaris10-x64.tar.gz +jboss-native-2.0.4-solaris10-sun4v-ssl.tar.gz +jboss-native-2.0.4-solaris10-sun4v.tar.gz jboss-native-2.0.4-macosx-x86-ssl.tar.gz jboss-native-2.0.4-macosx-x86.tar.gz jboss-native-2.0.4-src-ssl.tar.gz Modified: trunk/site-jbossweb/files.sh =================================================================== --- trunk/site-jbossweb/files.sh 2011-08-11 07:21:46 UTC (rev 2844) +++ trunk/site-jbossweb/files.sh 2011-08-11 07:58:30 UTC (rev 2845) @@ -1,6 +1,6 @@ for file in `cat files.list` do - HTTPFILE=`echo $file | sed 's:-2.0.4-:-2.0.9-:'` + HTTPFILE=`echo $file | sed 's:-2.0.4-:-2.0.10-:'` FILE=${HTTPFILE} case $FILE in *hpux-parisc2*) @@ -21,13 +21,13 @@ *macosx*) BASE=JBossWebNative-macosx ;; - *solaris-sparcv9*) - BASE=JBossWebNative-solaris-sparc + *solaris9-sparcv9*) + BASE=JBossWebNative-solaris9-sparc64 ;; - *solaris-x86*) - BASE=JBossWebNative-solaris-x86 + *solaris10-x64*) + BASE=JBossWebNative-solaris10-x64 ;; - *solaris-sun4v*) + *solaris10-sun4v*) BASE=JBossWebNative-solaris10-sparc FILE=`echo ${HTTPFILE} | sed 's:-solaris-sun4v-:-solaris10-sparc-:'` ;; @@ -43,7 +43,7 @@ esac echo $HTTPFILE echo $BASE - (cd 2.0.9.GA + (cd 2.0.10.GA wget http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuccessfulB... || exit 1 if [ $HTTPFILE != $FILE ]; then mv $HTTPFILE $FILE || exit 1

13 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2844 - in trunk: site-jbossweb and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2011-08-11 03:21:46 -0400 (Thu, 11 Aug 2011) New Revision: 2844 Added: trunk/site-jbossweb/ trunk/site-jbossweb/files.list trunk/site-jbossweb/files.sh trunk/site-jbossweb/firstnode.xml trunk/site-jbossweb/gen.downloads.sh trunk/site-jbossweb/gen.project.sh trunk/site-jbossweb/itemdownload.xml trunk/site-jbossweb/itemdownload2.xml Log: Move the site building logic from cms.labs.jboss.com :D Added: trunk/site-jbossweb/files.list =================================================================== --- trunk/site-jbossweb/files.list (rev 0) +++ trunk/site-jbossweb/files.list 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,23 @@ +jboss-native-2.0.4-windows-x86-ssl.zip +jboss-native-2.0.4-windows-x64-ssl.zip +jboss-native-2.0.4-windows-i64-ssl.zip +jboss-native-2.0.4-hpux-i64.tar.gz +jboss-native-2.0.4-hpux-parisc2-ssl.tar.gz +jboss-native-2.0.4-hpux-parisc2.tar.gz +jboss-native-2.0.4-linux2-i64-ssl.tar.gz +jboss-native-2.0.4-linux2-i64.tar.gz +jboss-native-2.0.4-linux2-x64-ssl.tar.gz +jboss-native-2.0.4-linux2-x64.tar.gz +jboss-native-2.0.4-linux2-x86-ssl.tar.gz +jboss-native-2.0.4-linux2-x86.tar.gz +jboss-native-2.0.4-solaris-sparcv9-ssl.tar.gz +jboss-native-2.0.4-solaris-sparcv9.tar.gz +jboss-native-2.0.4-solaris-x86-ssl.tar.gz +jboss-native-2.0.4-solaris-x86.tar.gz +jboss-native-2.0.4-solaris-sun4v-ssl.tar.gz +jboss-native-2.0.4-solaris-sun4v.tar.gz +jboss-native-2.0.4-macosx-x86-ssl.tar.gz +jboss-native-2.0.4-macosx-x86.tar.gz +jboss-native-2.0.4-src-ssl.tar.gz +jboss-native-2.0.4-src-ssl.zip +jboss-native-2.0.4-src.tar.gz Added: trunk/site-jbossweb/files.sh =================================================================== --- trunk/site-jbossweb/files.sh (rev 0) +++ trunk/site-jbossweb/files.sh 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,52 @@ +for file in `cat files.list` +do + HTTPFILE=`echo $file | sed 's:-2.0.4-:-2.0.9-:'` + FILE=${HTTPFILE} + case $FILE in + *hpux-parisc2*) + BASE=JBossWebNative-hp-ux-9000_800 + ;; + *hpux-i64*) + BASE=JBossWebNative-hp-ux-ia64 + ;; + *linux2-x86*) + BASE=JBossWebNative-linux-i686 + ;; + *linux2-i64*) + BASE=JBossWebNative-linux-ia64 + ;; + *linux2-x64*) + BASE=JBossWebNative-linux-x86_64 + ;; + *macosx*) + BASE=JBossWebNative-macosx + ;; + *solaris-sparcv9*) + BASE=JBossWebNative-solaris-sparc + ;; + *solaris-x86*) + BASE=JBossWebNative-solaris-x86 + ;; + *solaris-sun4v*) + BASE=JBossWebNative-solaris10-sparc + FILE=`echo ${HTTPFILE} | sed 's:-solaris-sun4v-:-solaris10-sparc-:'` + ;; + *windows*) + BASE=JBossWebNative-windows + ;; + *.zip) + BASE=JBossWebNative-windows + ;; + *-src-ssl.tar.gz | *-src.tar.gz) + BASE=JBossWebNative-linux-i686 + ;; + esac + echo $HTTPFILE + echo $BASE + (cd 2.0.9.GA + wget http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuccessfulB... || exit 1 + if [ $HTTPFILE != $FILE ]; then + mv $HTTPFILE $FILE || exit 1 + fi + ) || exit 1 +done Added: trunk/site-jbossweb/firstnode.xml =================================================================== --- trunk/site-jbossweb/firstnode.xml (rev 0) +++ trunk/site-jbossweb/firstnode.xml 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,5 @@ +<sv:node sv:name="@node@" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" + xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:rep="internal" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fn="http://www.w3.org/2005/xpath-functions" + xmlns:_pre="http://jboss.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0"> Added: trunk/site-jbossweb/gen.downloads.sh =================================================================== --- trunk/site-jbossweb/gen.downloads.sh (rev 0) +++ trunk/site-jbossweb/gen.downloads.sh 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,92 @@ +# jbossnative files download page generator... +VERSION=2.0.9 +count=0 +# Print a file entry in the project.xml file +# $1 file name +# $2 type binaries or sources or java +printfile() +{ + file=$1 + type=$2 + desc=$3 + + os=`echo $file | awk -F- ' { print $3 } '` + pro=`echo $file | awk -F- ' { print $4 } '` + # quick hack for the solaris9/10 + case "${os}-${pro}" in + solaris-sparcv9) + os=solaris9 + ;; + solaris-x86) + os=solaris10 + ;; + esac + case "$type" in + binaries|dynamic*) + type="$type ${os}-${pro}" + ;; + esac + + size=`ls -lh $file | awk ' { print $5 } '` + date=`ls -lh $file | awk ' { print $6" "$7 }'` + # date=`date -d "$date" +'%FT%H:%M:%S.000%z'` only F11+ + date=`date -d "$date" +'%FT%H:%M:%S.000Z'` + count=`expr $count + 1` + num=`echo $count | awk ' { if ($1<10) print "0"$1; else print $1 } '` + cat << EOF + <sv:property sv:name="desc${num}" sv:type="String"> + <sv:value>${desc}</sv:value> + </sv:property> + <sv:property sv:name="license${num}" sv:type="String"> + <sv:value>LGPL</sv:value> + </sv:property> + <sv:property sv:name="name${num}" sv:type="String"> + <sv:value>${type}</sv:value> + </sv:property> + <sv:property sv:name="releaseDate${num}" sv:type="Date"> + <sv:value>${date}</sv:value> + </sv:property> + <sv:property sv:name="size${num}" sv:type="String"> + <sv:value>${size}</sv:value> + </sv:property> + <sv:property sv:name="text${num}" sv:type="String"> + <sv:value>jboss-native-${version}</sv:value> + </sv:property> + <sv:property sv:name="url${num}" sv:type="String"> + <sv:value>http://downloads.jboss.org/jbossnative/${version}/${file}</sv:value> + </sv:property> +EOF +} + +# print the first part of the export stuff. +cat firstnode.xml | sed "s:@node@:downloads:" +cat itemdownload.xml + +# Sources in tarball format. +printfile ${VERSION}.GA/jboss-native-${VERSION}-src-ssl.tar.gz "source tarball" "jboss-native $VERSION sources" + +# Sources in zip format +printfile ${VERSION}.GA/jboss-native-${VERSION}-src-ssl.zip "source zip" "jboss-native $VERSION sources" + +# Process bundles +for file in `ls ${VERSION}.GA/jboss-native-${VERSION}-*-ssl.tar.gz` +do + case "${file}" in + *-src-*) + continue; + ;; + esac + printfile ${file} "binaries" "jboss-native $VERSION tar bundles" +done +for file in `ls ${VERSION}.GA/jboss-native-${VERSION}-*-ssl.zip` +do + case "${file}" in + *-src-*) + continue; + ;; + esac + printfile ${file} "binaries" "jboss-native $VERSION zip bundles" +done + +# write the end of node... +cat itemdownload2.xml Added: trunk/site-jbossweb/gen.project.sh =================================================================== --- trunk/site-jbossweb/gen.project.sh (rev 0) +++ trunk/site-jbossweb/gen.project.sh 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,71 @@ +# Generate a part of the project.xml file... +VERSION=2.0.8 +date=`date +'%F'` + +# Sources in tarball format. +file=${VERSION}.GA/jboss-native-${VERSION}-src-ssl.tar.gz +size=`ls -lh $file | awk ' { print $5 } '` +cat << EOF + <file> + <id>http://labs.jboss.com/file-access/default/members/jbossweb/freezone/dist/...</id> + <name>jboss-native source tarball</name> + <description>Source in tar.gz format</description> + <size>${size}</size> + <license>LGPL</license> + <release>${date}</release> + </file> +EOF +# Sources in zip format +file=${VERSION}.GA/jboss-native-${VERSION}-src-ssl.zip +size=`ls -lh $file | awk ' { print $5 } '` +cat << EOF + <file> + <id>http://labs.jboss.com/file-access/default/members/jbossweb/freezone/dist/...</id> + <name>jboss-native source zip</name> + <description>Source in zip format</description> + <size>${size}</size> + <license>LGPL</license> + <release>${date}</release> + </file> +EOF +# Print a file entry in the project.xml file +printfile() +{ + file=$1 + type=$2 + os=`echo $file | awk -F- ' { print $4 } '` + pro=`echo $file | awk -F- ' { print $5 } '` + size=`ls -lh $file | awk ' { print $5 } '` + date=`date +'%F'` +# quick hack for the solaris9/10 +case "${os}-${pro}" in + solaris-sparcv9) + os=solaris9 + ;; + solaris-x86) + os=solaris10 + ;; + src-*) + return 0 + ;; +esac +cat << EOF + <file> + <id>http://labs.jboss.com/file-access/default/members/jbossweb/freezone/dist/...</id> + <name>jboss-native ${type} - ${os} ${pro}</name> + <description>${os} ${pro} package</description> + <size>${size}</size> + <license>LGPL</license> + <release>${date}</release> + </file> +EOF +} +# Process bundles +for file in `ls ${VERSION}.GA/jboss-native-${VERSION}-*-ssl.tar.gz` +do + printfile ${file} "binaries" +done +for file in `ls ${VERSION}.GA/jboss-native-${VERSION}-*-ssl.zip` +do + printfile ${file} "binaries" +done Added: trunk/site-jbossweb/itemdownload.xml =================================================================== --- trunk/site-jbossweb/itemdownload.xml (rev 0) +++ trunk/site-jbossweb/itemdownload.xml 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,170 @@ + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:content</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="enableRSS" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="hideInNav" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="menubar" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="metaCache" sv:type="String"> + <sv:value>disable</sv:value> + </sv:property> + <sv:property sv:name="metaExpire" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="metaRobots" sv:type="String"> + <sv:value>all</sv:value> + </sv:property> + <sv:property sv:name="redirectWindow" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>JBoss Web Native Connectors Downloads</sv:value> + </sv:property> + <sv:property sv:name="useTitle" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>jboss-native</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>jbossORGProjectTemplate</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="orgLayoutHeader"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="headerInheritParagraphsDirection" sv:type="String"> + <sv:value>rootToCurrent</sv:value> + </sv:property> + <sv:property sv:name="showHeaderInheritParagraphs" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="showHeaderInheritParagraphsPos" sv:type="String"> + <sv:value>below</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>orgLayoutHeader</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="orgLayoutBody"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="browserTitelBreadcrumb" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="ignoreInherit" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="showLeftColumn" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="showRightColumn" sv:type="String"> + <sv:value>false</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>orgLayoutBody</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="mainColumnParagraphs"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>jboss-native</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="0"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="popup" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="showDescription" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="showLicense" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="showReleaseDate" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="showSize" sv:type="String"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="tableDesc" sv:type="String"> + <sv:value>Bundles ready to use</sv:value> + </sv:property> + <sv:property sv:name="tableTitle" sv:type="String"> + <sv:value>JBoss Web Native Connectors - Current packages</sv:value> + </sv:property> Added: trunk/site-jbossweb/itemdownload2.xml =================================================================== --- trunk/site-jbossweb/itemdownload2.xml (rev 0) +++ trunk/site-jbossweb/itemdownload2.xml 2011-08-11 07:21:46 UTC (rev 2844) @@ -0,0 +1,20 @@ + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>jboss-native</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>downloads</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node>

13 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2843 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

13 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2842 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2011-08-08 07:57:09 -0400 (Mon, 08 Aug 2011) New Revision: 2842 Modified: trunk/build/unix/buildbin.TC7.sh Log: Arrange the logic to stop Tomcat after errors... Modified: trunk/build/unix/buildbin.TC7.sh =================================================================== --- trunk/build/unix/buildbin.TC7.sh 2011-08-08 08:03:11 UTC (rev 2841) +++ trunk/build/unix/buildbin.TC7.sh 2011-08-08 11:57:09 UTC (rev 2842) @@ -48,8 +48,20 @@ has_openssl_loc=$4 has_static_loc=$5 sources_loc=$6 + +# Stop Tomcat +stopTomcat() +{ +(cd $native_sources/output/build; bin/shutdown.sh) +sleep 10 +PID=`ps -ef | grep $native_sources | grep java | awk ' { print $2 } '` +if [ x$PID != "x" ]; then + kill -15 $PID + sleep 10 +fi +} + current_loc=`pwd` - native_sources=srclib/`ls srclib | grep TC7` native_sources=`(cd $native_sources; pwd)` cd $native_sources @@ -58,13 +70,7 @@ echo "" echo "Stopping tomcat (just in case)" echo "" -(cd $native_sources/output/build; bin/shutdown.sh) -sleep 10 -PID=`ps -ef | grep $native_sources | grep java | awk ' { print $2 } '` -if [ x$PID != "x" ]; then - kill -15 $PID - sleep 10 -fi +stopTomcat echo "" echo "Running ant tests" @@ -98,19 +104,35 @@ echo "" export TS_HOME=/home/hudson/tcks/servlet/servlettck export ANT_HOME=$TS_HOME/tools/ant -(cd $TS_HOME/bin; ant run.all || exit 1) || exit 1 -(cd $TS_HOME/bin; ant report || exit 1) || exit 1 +(cd $TS_HOME/bin; ant run.all || exit 1) +if [ $? -ne 0 ];then + stopTomcat + exit 1 +fi +(cd $TS_HOME/bin; ant report || exit 1) +if [ $? -ne 0 ];then + stopTomcat + exit 1 +fi echo "JSP" export TS_HOME=/home/hudson/tcks/jsp/jsptck export ANT_HOME=$TS_HOME/tools/ant -(cd $TS_HOME/bin; ant run.all || exit 1) || exit 1 -(cd $TS_HOME/bin; ant report || exit 1) || exit 1 +(cd $TS_HOME/bin; ant run.all || exit 1) +if [ $? -ne 0 ];then + stopTomcat + exit 1 +fi +(cd $TS_HOME/bin; ant report || exit 1) +if [ $? -ne 0 ];then + stopTomcat + exit 1 +fi echo "" echo "Stopping TC7..." echo "" -(cd $native_sources/output/build; bin/shutdown.sh) +stopTomcat echo "" echo "Testing with native" @@ -161,7 +183,7 @@ grep http-apr $native_sources/output/build/logs/catalina.out if [ $? -ne 0 ]; then echo "Failed can't start native..." - (cd $native_sources/output/build; bin/shutdown.sh) + stopTomcat exit 1 fi @@ -173,13 +195,13 @@ (cd $TS_HOME/bin; ant run.all || exit 1) if [ $? -ne 0 ]; then echo "Failed test failed..." - (cd $native_sources/output/build; bin/shutdown.sh) + stopTomcat exit 1 else (cd $TS_HOME/bin; ant report || exit 1) if [ $? -ne 0 ]; then echo "Failed build test report failed..." - (cd $native_sources/output/build; bin/shutdown.sh) + stopTomcat exit 1 fi fi @@ -187,7 +209,7 @@ echo "" echo "Stopping TC7..." echo "" -(cd $native_sources/output/build; bin/shutdown.sh) +stopTomcat echo "Done" echo ""

13 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2841 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

13 years, 4 months

1
0
0 / 0

← Newer
1
2
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits August 2011