September 2009 - embjopr-commits - Jboss List Archives

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-09-30 08:55:16 -0400 (Wed, 30 Sep 2009) New Revision: 773 Modified: trunk/pom.xml Log: upgrade RHQ/Jopr deps to x.4.0-SNAPSHOT Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-24 16:43:15 UTC (rev 772) +++ trunk/pom.xml 2009-09-30 12:55:16 UTC (rev 773) @@ -25,7 +25,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -64,9 +64,9 @@  <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.6</jaxb-impl.version> - <jopr.version>2.3.0-SNAPSHOT</jopr.version> + <jopr.version>2.4.0-SNAPSHOT</jopr.version> <richfaces.version>3.3.0.GA</richfaces.version> - <rhq.version>1.3.0-SNAPSHOT</rhq.version> + <rhq.version>1.4.0-SNAPSHOT</rhq.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version> <!-- This is a special patched version of not-yet-released Facelets 1.1.15,

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r772 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-24 12:43:15 -0400 (Thu, 24 Sep 2009) New Revision: 772 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson script: added rm pom.xml before svn up to prevent collision. Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-23 16:22:11 UTC (rev 771) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-24 16:43:15 UTC (rev 772) @@ -73,6 +73,7 @@ cd jsfunit # But get the latest testcases. + rm pom.xml svn up echo "Launching tests; binding JBoss AS to MYTESTIP_1 == $MYTESTIP_1"

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r771 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-23 12:22:11 -0400 (Wed, 23 Sep 2009) New Revision: 771 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script updated: `pwd` replaced with $WORKSPACE Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-23 00:47:29 UTC (rev 770) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-23 16:22:11 UTC (rev 771) @@ -26,7 +26,8 @@ ### Set JBoss AS home dir -export JBOSS_HOME=`pwd`/jboss-eap-5.0/jboss-as +#export JBOSS_HOME=`pwd`/jboss-eap-5.0/jboss-as +export JBOSS_HOME=$WORKSPACE/jboss-eap-5.0/jboss-as echo "JBOSS_HOME: $JBOSS_HOME" # Remove bundled AS console # Name of war changed on 04/24 - smcgowan

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r770 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 20:47:29 -0400 (Tue, 22 Sep 2009) New Revision: 770 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script updated - patch --binary Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-23 00:07:29 UTC (rev 769) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-23 00:47:29 UTC (rev 770) @@ -96,7 +96,7 @@ echo "Running tests for part '$part'..." svn revert pom.xml echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..." - patch -p0 < testdata/pom_patches/pom-$part.patch + patch -p0 --binary < testdata/pom_patches/pom-$part.patch echo "Killing JBoss AS..." killJBossAS rm -rf target/jboss5x # Empty Cargo's configuration dir

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r769 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 20:07:29 -0400 (Tue, 22 Sep 2009) New Revision: 769 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script updated - solved SVN conflict Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 21:31:52 UTC (rev 768) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-23 00:07:29 UTC (rev 769) @@ -51,6 +51,8 @@ cd embjopr + rm pom.xml # We will modify this later, SVN would conflict. + # "Downdate" to older version svn_rev_default="HEAD" if [ -n "$SVN_REV" ]; then svn up -r $SVN_REV; fi

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r768 - in trunk/jsfunit/testdata: pom_patches and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 17:31:52 -0400 (Tue, 22 Sep 2009) New Revision: 768 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh trunk/jsfunit/testdata/pom_patches/pom-Apps.patch trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch trunk/jsfunit/testdata/pom_patches/pom-Jms.patch trunk/jsfunit/testdata/pom_patches/pom-theRest.patch Log: * hudson shell script updated * POM patch files updated Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 20:59:35 UTC (rev 767) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 21:31:52 UTC (rev 768) @@ -62,9 +62,9 @@ sed "s#<module>jsfunit</module>##g" pom.xml > pom_tmp.xml && mv -f pom_tmp.xml pom.xml ## Dump settings - without explicitely set settings file - mvn -Pjboss5x help:effective-settings + #mvn -Pjboss5x help:effective-settings ## Dump settings - with explicitely set settings file - mvn $M2_SETTINGS -Pjboss5x help:effective-settings + #mvn $M2_SETTINGS -Pjboss5x help:effective-settings mvn install -Dmaven.test.skip=true --update-snapshots @@ -76,18 +76,7 @@ #echo -e "USER hudson hudson hudson hudson\nNICK HudsonBot\nJOIN #embjopr\nPRIVMSG #embjopr :`hostname`\nQUIT\n" |nc irc.devel.redhat.com 6667 || : echo `hostname`:4000 >> /tmp/embjopr-debug.log - ## Remove app tests - because of the memory leak, we need to split the test run to more parts. - #if [ -n "$TEST_SUITE_PART" ]; then - # svn revert pom.xml - # patch -p0 < /home/hudson/ozizka/JoprEmbedded/pom-JmsAndDatasources.patch - #fi - ## Without explicitely set settings file - mvn -Pjboss5x help:effective-settings - ## With explicitely set settings file - mvn $M2_SETTINGS -Pjboss5x help:effective-settings - - #mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 if [ -n "$NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi Modified: trunk/jsfunit/testdata/pom_patches/pom-Apps.patch =================================================================== --- trunk/jsfunit/testdata/pom_patches/pom-Apps.patch 2009-09-22 20:59:35 UTC (rev 767) +++ trunk/jsfunit/testdata/pom_patches/pom-Apps.patch 2009-09-22 21:31:52 UTC (rev 768) @@ -1,34 +1,20 @@ Index: pom.xml =================================================================== ---- pom.xml (revision 699) +--- pom.xml (revision 759) +++ pom.xml (working copy) -@@ -510,39 +510,12 @@ - <failIfNoTests>true</failIfNoTests> - <testFailureIgnore>true</testFailureIgnore> - <includes> --  + - <include>**/as5/*Test.java</include> -- <include>**/as5/app/ear/*Test.java</include> - <include>**/as5/app/war/*Test.java</include> - <include>**/as5/app/embwar/*Test.java</include> -- <include>**/as5/app/rar/*Test.java</include> -- <include>**/as5/app/ejb/*Test.java</include> -- <include>**/as5/jmsDestinations/*Test.java</include> -- <include>**/as5/datasources/*Test.java</include> -- <include>**/as5/connfactories/*Test.java</include> -- <include>**/as5/connectors/*Test.java</include> - <include>**/jsfunit/*Test.java</include> -- --> - -- <include>**/as5/*Test.java</include> -- <include>**/jsfunit/*Test.java</include> -- - <include>**/as5/connfactories/*Test.java</include> - <include>**/as5/datasources/*Test.java</include> - <include>**/as5/jmsDestinations/*Test.java</include> - -- <include>**/as5/app/war/*Test.java</include> -- <include>**/as5/app/embwar/*Test.java</include> + <include>**/as5/app/war/*Test.java</include> + <include>**/as5/app/embwar/*Test.java</include> <include>**/as5/app/ear/*Test.java</include> <include>**/as5/app/rar/*Test.java</include> <include>**/as5/app/ejb/*Test.java</include> Modified: trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch =================================================================== --- trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch 2009-09-22 20:59:35 UTC (rev 767) +++ trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch 2009-09-22 21:31:52 UTC (rev 768) @@ -1,32 +1,18 @@ Index: pom.xml =================================================================== ---- pom.xml (revision 699) +--- pom.xml (revision 759) +++ pom.xml (working copy) -@@ -510,39 +510,8 @@ - <failIfNoTests>true</failIfNoTests> - <testFailureIgnore>true</testFailureIgnore> - <includes> --  +@@ -543,25 +543,8 @@ + <include>**/jsfunit/*Test.java</include> + --> - <include>**/as5/*Test.java</include> - <include>**/jsfunit/*Test.java</include> - -- <include>**/as5/connfactories/*Test.java</include> + <include>**/as5/connfactories/*Test.java</include> - <include>**/as5/datasources/*Test.java</include> - <include>**/as5/jmsDestinations/*Test.java</include> -- + - <include>**/as5/app/war/*Test.java</include> - <include>**/as5/app/embwar/*Test.java</include> - <include>**/as5/app/ear/*Test.java</include> Modified: trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch =================================================================== --- trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch 2009-09-22 20:59:35 UTC (rev 767) +++ trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch 2009-09-22 21:31:52 UTC (rev 768) @@ -1,32 +1,18 @@ Index: pom.xml =================================================================== ---- pom.xml (revision 699) +--- pom.xml (revision 759) +++ pom.xml (working copy) -@@ -510,39 +510,8 @@ - <failIfNoTests>true</failIfNoTests> - <testFailureIgnore>true</testFailureIgnore> - <includes> --  +@@ -543,25 +543,8 @@ + <include>**/jsfunit/*Test.java</include> + --> - <include>**/as5/*Test.java</include> - <include>**/jsfunit/*Test.java</include> - - <include>**/as5/connfactories/*Test.java</include> -- <include>**/as5/datasources/*Test.java</include> + <include>**/as5/datasources/*Test.java</include> - <include>**/as5/jmsDestinations/*Test.java</include> -- + - <include>**/as5/app/war/*Test.java</include> - <include>**/as5/app/embwar/*Test.java</include> - <include>**/as5/app/ear/*Test.java</include> Modified: trunk/jsfunit/testdata/pom_patches/pom-Jms.patch =================================================================== --- trunk/jsfunit/testdata/pom_patches/pom-Jms.patch 2009-09-22 20:59:35 UTC (rev 767) +++ trunk/jsfunit/testdata/pom_patches/pom-Jms.patch 2009-09-22 21:31:52 UTC (rev 768) @@ -1,32 +1,18 @@ Index: pom.xml =================================================================== ---- pom.xml (revision 699) +--- pom.xml (revision 759) +++ pom.xml (working copy) -@@ -510,39 +510,8 @@ - <failIfNoTests>true</failIfNoTests> - <testFailureIgnore>true</testFailureIgnore> - <includes> --  +@@ -543,25 +543,8 @@ + <include>**/jsfunit/*Test.java</include> + --> - <include>**/as5/*Test.java</include> - <include>**/jsfunit/*Test.java</include> - - <include>**/as5/connfactories/*Test.java</include> - <include>**/as5/datasources/*Test.java</include> -- <include>**/as5/jmsDestinations/*Test.java</include> -- + <include>**/as5/jmsDestinations/*Test.java</include> + - <include>**/as5/app/war/*Test.java</include> - <include>**/as5/app/embwar/*Test.java</include> - <include>**/as5/app/ear/*Test.java</include> Modified: trunk/jsfunit/testdata/pom_patches/pom-theRest.patch =================================================================== --- trunk/jsfunit/testdata/pom_patches/pom-theRest.patch 2009-09-22 20:59:35 UTC (rev 767) +++ trunk/jsfunit/testdata/pom_patches/pom-theRest.patch 2009-09-22 21:31:52 UTC (rev 768) @@ -1,15 +1,15 @@ Index: pom.xml =================================================================== ---- pom.xml (revision 699) +--- pom.xml (revision 759) +++ pom.xml (working copy) -@@ -527,16 +527,7 @@ +@@ -546,16 +546,6 @@ <include>**/as5/*Test.java</include> <include>**/jsfunit/*Test.java</include> - <include>**/as5/connfactories/*Test.java</include> - <include>**/as5/datasources/*Test.java</include> - <include>**/as5/jmsDestinations/*Test.java</include> - +- - <include>**/as5/app/war/*Test.java</include> - <include>**/as5/app/embwar/*Test.java</include> - <include>**/as5/app/ear/*Test.java</include>

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r767 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 16:59:35 -0400 (Tue, 22 Sep 2009) New Revision: 767 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script: sed "s#<module>jsfunit</module>##g" pom.xml > pom_tmp.xml && mv -f pom_tmp.xml pom.xml instead of svn tricks - could give us new dependencies... Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 20:42:39 UTC (rev 766) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 20:59:35 UTC (rev 767) @@ -54,9 +54,13 @@ # "Downdate" to older version svn_rev_default="HEAD" if [ -n "$SVN_REV" ]; then svn up -r $SVN_REV; fi - rm pom.xml - svn up pom.xml + ## Disable the jsfunit module. + #rm pom.xml + #svn up pom.xml + #sed -i 's#<module>jsfunit</module>##g' pom.xml # Linux only + sed "s#<module>jsfunit</module>##g" pom.xml > pom_tmp.xml && mv -f pom_tmp.xml pom.xml + ## Dump settings - without explicitely set settings file mvn -Pjboss5x help:effective-settings ## Dump settings - with explicitely set settings file

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r766 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 16:42:39 -0400 (Tue, 22 Sep 2009) New Revision: 766 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script: if [ ! -e eap5.zip ] ; then wget ... Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 19:42:14 UTC (rev 765) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 20:42:39 UTC (rev 766) @@ -16,7 +16,9 @@ ### Get and unzip EAP 5 binaries #if [ -n $EAP_URL ] ; then if [[ "$EAP_ZIP_PATH" = http:* ]] ; then - wget -m -O eap5.zip $EAP_ZIP_PATH # --no-clobber + if [ ! -e eap5.zip ] ; then + wget --no-clobber -O eap5.zip $EAP_ZIP_PATH # -m + fi EAP_ZIP_PATH=eap5.zip fi rm -rf jboss-eap-5.0

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r765 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 15:42:14 -0400 (Tue, 22 Sep 2009) New Revision: 765 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script: ~/config_repository/scripts/functions.d/kill-jboss copied to testdata/bash_functions.sh # killJBossAS() Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 19:41:43 UTC (rev 764) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 19:42:14 UTC (rev 765) @@ -92,7 +92,7 @@ else ## Include functions for Hudson. #. ~/config_repository/scripts/common/common_bash.sh - . bash_functions.sh + . testdata/bash_functions.sh ## Split testsuite to parts, because of OOME for part in Apps ConnFactories Datasources Jms theRest; do

15 years, 3 months

1
0
0 / 0

EMBJOPR SVN: r764 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-09-22 15:41:43 -0400 (Tue, 22 Sep 2009) New Revision: 764 Added: trunk/jsfunit/testdata/bash_functions.sh Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script: ~/config_repository/scripts/functions.d/kill-jboss copied to bash_functions.sh # killJBossAS() Added: trunk/jsfunit/testdata/bash_functions.sh =================================================================== --- trunk/jsfunit/testdata/bash_functions.sh (rev 0) +++ trunk/jsfunit/testdata/bash_functions.sh 2009-09-22 19:41:43 UTC (rev 764) @@ -0,0 +1,22 @@ +function killJBossAS { + ( + if [[ `uname -s` == 'Linux' ]]; then + local PS='ps -eaf --columns 2200 | grep run.jar | grep -v grep | awk '\''{ print $2; }'\' + eval "$PS" | xargs kill -3 + sleep 1 + eval "$PS" | xargs kill + sleep 10 + eval "$PS" | xargs kill -9 + elif lsof -i TCP:8080 &> /dev/null; then + local LSOF='lsof -t -i TCP:8080,8443,1099,1098,4444,4445,1093,1701' + kill -3 `$LSOF` + sleep 1 + kill `$LSOF` + sleep 10 + kill -9 `$LSOF` + else + echo Not yet supported on `uname -s` UNIX favour without working lsof. + return 1 + fi + ) || return 0 +} Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 18:55:21 UTC (rev 763) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 19:41:43 UTC (rev 764) @@ -91,7 +91,9 @@ mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 else ## Include functions for Hudson. - . ~/config_repository/scripts/common/common_bash.sh + #. ~/config_repository/scripts/common/common_bash.sh + . bash_functions.sh + ## Split testsuite to parts, because of OOME for part in Apps ConnFactories Datasources Jms theRest; do echo "Running tests for part '$part'..." @@ -99,7 +101,7 @@ echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..." patch -p0 < testdata/pom_patches/pom-$part.patch echo "Killing JBoss AS..." - kill-jboss + killJBossAS rm -rf target/jboss5x # Empty Cargo's configuration dir mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits September 2009