Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 12:09:18 -0400 (Fri, 25 Apr 2008)
New Revision: 6711
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml
Log:
jboss50x cxf integration
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-25
15:58:45 UTC (rev 6710)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-25
16:09:18 UTC (rev 6711)
@@ -11,9 +11,10 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss500
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -25,7 +26,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
+ant $ENVIRONMENT clean deploy-jboss500
#
# start jbossas
@@ -39,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET test 2>&1 | tee
$WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -57,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-25
15:58:45 UTC (rev 6710)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-25
16:09:18 UTC (rev 6711)
@@ -11,9 +11,10 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss501
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -25,7 +26,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
+ant $ENVIRONMENT clean deploy-jboss501
#
# start jbossas
@@ -39,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET test 2>&1 | tee
$WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -57,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-04-25
15:58:45 UTC (rev 6710)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-04-25
16:09:18 UTC (rev 6711)
@@ -11,9 +11,10 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss500
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -25,14 +26,13 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
+ant $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
#
-cd output/jbossws-cxf-dist
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT deploy-jboss500
+cd target/jbossws-cxf-dist
+ant $ENVIRONMENT deploy-jboss500
#
# start jbossas
@@ -46,11 +46,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -64,7 +64,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults>
+
<testResults>stack-cxf/target/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-04-25
15:58:45 UTC (rev 6710)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-04-25
16:09:18 UTC (rev 6711)
@@ -11,9 +11,10 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss501
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -25,14 +26,13 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
+ant $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
#
-cd output/jbossws-cxf-dist
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT deploy-jboss501
+cd target/jbossws-cxf-dist
+ant $ENVIRONMENT deploy-jboss501
#
# start jbossas
@@ -46,11 +46,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -64,7 +64,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults>
+
<testResults>stack-cxf/target/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-04-25
15:58:45 UTC (rev 6710)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-04-25
16:09:18 UTC (rev 6711)
@@ -11,9 +11,10 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss500
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -21,11 +22,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# build and deploy
+# build and deploy
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
+ant $ENVIRONMENT clean deploy-jboss500
#
# start jbossas
@@ -43,7 +44,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee
$WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase test
2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -57,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-04-25
15:58:45 UTC (rev 6710)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-04-25
16:09:18 UTC (rev 6711)
@@ -11,9 +11,10 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss501
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
+ENVIRONMENT=&quot;-Djboss.bind.address=(a)jboss.bind.address@
-Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -21,11 +22,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# build and deploy
+# build and deploy
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
+ant $ENVIRONMENT clean deploy-jboss501
#
# start jbossas
@@ -43,7 +44,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee
$WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase test
2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -57,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>