JBossWS SVN: r12575 - in framework/trunk/hudson: hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 12:23:10 -0400 (Mon, 05 Jul 2010)
New Revision: 12575
Added:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
Modified:
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
[JBWS-3049] First cut of stack switch job
Added: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 16:23:10 UTC (rev 12575)
@@ -0,0 +1,165 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=SWITCH-BINDIST-AS-6.0.0
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.sun.jdk6@
+HUDSON_DIR=$WORKSPACE/framework-hudson
+TEST_OPTS=
+JBOSS_TARGET=jboss600
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/target/(a)hudson.jboss600.build@
+CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-cxf/
+METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-cxf/
+NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-cxf/
+CXF_AS_HOME=$WORKSPACE/cxf-as
+NATIVE_AS_HOME=$WORKSPACE/native-as
+METRO_AS_HOME=$WORKSPACE/metro-as
+
+#
+# load test functions
+#
+. $HUDSON_DIR/jboss/bin/jbossws-qa.sh
+
+rm -rf $CXF_AS_HOME
+cp -r $JBOSS_INSTANCE $CXF_AS_HOME
+JBOSS_HOME=$CXF_AS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $NATIVE_AS_HOME
+cp -r $JBOSS_INSTANCE $NATIVE_AS_HOME
+JBOSS_HOME=$NATIVE_AS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $METRO_AS_HOME
+cp -r $JBOSS_INSTANCE $METRO_AS_HOME
+JBOSS_HOME=$METRO_AS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $WORKSPACE/modified-as
+JBOSS_HOME=$WORKSPACE/modified-as
+rm -rf result.txt
+touch result.txt
+
+
+#------------------------------------- CXF stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
+cat $WORKSPACE/cxf_vs_cxfOverMetro.diff >> $WORKSPACE/result.txt
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverNative.diff
+cat $WORKSPACE/cxf_vs_cxfOverNative.diff >> $WORKSPACE/result.txt
+
+
+#------------------------------------- NATIVE stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
+cat $WORKSPACE/native_vs_nativeOverMetro.diff >> $WORKSPACE/result.txt
+rm -rf $JBOSS_HOME
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
+cat $WORKSPACE/native_vs_nativeOverCxf.diff >> $WORKSPACE/result.txt
+
+
+#------------------------------------- METRO stack checks -------------------------------------
+
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverCxf.diff
+cat $WORKSPACE/metro_vs_metroOverCxf.diff >> $WORKSPACE/result.txt
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverNative.diff
+cat $WORKSPACE/metro_vs_metroOverNative.diff >> $WORKSPACE/result.txt
+
+
+rm -rf $JBOSS_HOME
+rm -rf $CXF_AS_HOME
+rm -rf $NATIVE_AS_HOME
+rm -rf $METRO_AS_HOME
+
+cd $WORKSPACE
+if [ -s $WORKSPACE/result.txt ]; then
+ echo "Differences detected"
+ exit 1
+fi
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@/hudson</remote>
+ <local>framework-hudson</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Test jbossws bindist stack switch against AS 6.0.0</description>
+ <actions class="vector"/>
+</project>
Property changes on: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 14:37:26 UTC (rev 12574)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 16:23:10 UTC (rev 12575)
@@ -7,6 +7,12 @@
fi
}
+setupJBossHome() {
+ rm -rf $WORKSPACE/jboss-as
+ cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as
+ export JBOSS_HOME=$WORKSPACE/jboss-as
+}
+
setupEnv() {
TMP_DIR_PROPERTY=
if [ -d /data/tmp ]; then
@@ -18,10 +24,6 @@
exit -1;
fi
- rm -rf $WORKSPACE/jboss-as
- cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as
- export JBOSS_HOME=$WORKSPACE/jboss-as
-
ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_HOME"
}
@@ -102,6 +104,12 @@
ant $ENVIRONMENT deploy-$JBOSS_TARGET
}
+redeployBinaryDistribution() {
+ cd $STACK_DIR/target/jbossws-$STACK_ID-bin-dist
+ ant clean
+ ant $ENVIRONMENT deploy-$JBOSS_TARGET
+}
+
deploySourceDistributionWithSpring() {
cd $STACK_DIR
cp profiles.xml.example profiles.xml
@@ -150,6 +158,7 @@
}
coreTestWithSpring() {
+ setupJBossHome
setupEnv
ensureJavaExists
stopJBoss
@@ -166,6 +175,7 @@
}
coreTest() {
+ setupJBossHome
setupEnv
ensureJavaExists
stopJBoss
@@ -182,6 +192,7 @@
}
binaryDistributionTestWithSpring() {
+ setupJBossHome
setupEnv
ensureJavaExists
stopJBoss
@@ -197,6 +208,7 @@
}
binaryDistributionTest() {
+ setupJBossHome
setupEnv
ensureJavaExists
stopJBoss
@@ -212,6 +224,7 @@
}
sourceDistributionTestWithSpring() {
+ setupJBossHome
setupEnv
ensureJavaExists
stopJBoss
@@ -228,6 +241,7 @@
}
sourceDistributionTest() {
+ setupJBossHome
setupEnv
ensureJavaExists
stopJBoss
13 years, 10 months
JBossWS SVN: r12574 - in framework/trunk/hudson: hudson-home/jobs/AS-TESTS-AS-5.1.0 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 10:37:26 -0400 (Mon, 05 Jul 2010)
New Revision: 12574
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
[JBWS-3049] Run hudson test jobs against vanilla AS
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml 2010-07-05 11:20:29 UTC (rev 12573)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml 2010-07-05 14:37:26 UTC (rev 12574)
@@ -14,12 +14,17 @@
JBOSS_TARGET=jboss501
JBOSS_BIND_ADDRESS=(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="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
+rm -rf $WORKSPACE/jboss-copy
+cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy
+export JBOSS_HOME=$JBOSS_INSTANCE
+
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_HOME"
+
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
#
# build and deploy
@@ -30,26 +35,26 @@
ant $ENVIRONMENT deploy-jboss501
# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
#
# start jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
# Was it successfully started?
$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
exit 1
fi
#
# build the testsuite
#
-cd $JBOSS_INSTANCE/../../../testsuite
+cd $JBOSS_HOME/../../../testsuite
./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
#
@@ -69,9 +74,11 @@
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+rm -rf $JBOSS_HOME
+mv $WORKSPACE/jboss-copy $JBOSS_HOME
</command>
</hudson.tasks.Shell>
</builders>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml 2010-07-05 11:20:29 UTC (rev 12573)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml 2010-07-05 14:37:26 UTC (rev 12574)
@@ -14,12 +14,17 @@
JBOSS_TARGET=jboss510
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE"
+rm -rf $WORKSPACE/jboss-copy
+cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy
+export JBOSS_HOME=$JBOSS_INSTANCE
+
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_HOME"
+
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
#
# build and deploy
@@ -30,26 +35,26 @@
ant $ENVIRONMENT deploy-jboss510
# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
#
# start jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
# Was it successfully started?
$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
exit 1
fi
#
# build the testsuite
#
-cd $JBOSS_INSTANCE/../../../testsuite
+cd $JBOSS_HOME/../../../testsuite
./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
#
@@ -69,9 +74,11 @@
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+rm -rf $JBOSS_HOME
+mv $WORKSPACE/jboss-copy $JBOSS_HOME
</command>
</hudson.tasks.Shell>
</builders>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2010-07-05 11:20:29 UTC (rev 12573)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2010-07-05 14:37:26 UTC (rev 12574)
@@ -14,12 +14,17 @@
JBOSS_TARGET=jboss600
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/target/(a)hudson.jboss600.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+rm -rf $WORKSPACE/jboss-copy
+cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy
+export JBOSS_HOME=$JBOSS_INSTANCE
+
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_HOME"
+
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
#
# build and deploy
@@ -30,26 +35,26 @@
ant $ENVIRONMENT deploy-jboss600
# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
#
# start jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
# Was it successfully started?
$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
exit 1
fi
#
# build the testsuite
#
-cd $JBOSS_INSTANCE/../../../testsuite
+cd $JBOSS_HOME/../../../testsuite
./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
#
@@ -69,9 +74,11 @@
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+rm -rf $JBOSS_HOME
+mv $WORKSPACE/jboss-copy $JBOSS_HOME
</command>
</hudson.tasks.Shell>
</builders>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 11:20:29 UTC (rev 12573)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 14:37:26 UTC (rev 12574)
@@ -14,12 +14,17 @@
JBOSS_TARGET=jboss601
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss601.home=$JBOSS_INSTANCE"
+rm -rf $WORKSPACE/jboss-copy
+cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy
+export JBOSS_HOME=$JBOSS_INSTANCE
+
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss601.home=$JBOSS_HOME"
+
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
#
# build and deploy
@@ -30,26 +35,26 @@
ant $ENVIRONMENT deploy-jboss601
# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
#
# start jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
# Was it successfully started?
$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
exit 1
fi
#
# build the testsuite
#
-cd $JBOSS_INSTANCE/../../../testsuite
+cd $JBOSS_HOME/../../../testsuite
./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
#
@@ -69,9 +74,11 @@
#
# stop jbossas
#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+rm -rf $JBOSS_HOME
+mv $WORKSPACE/jboss-copy $JBOSS_HOME
</command>
</hudson.tasks.Shell>
</builders>
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 11:20:29 UTC (rev 12573)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 14:37:26 UTC (rev 12574)
@@ -18,21 +18,24 @@
exit -1;
fi
- ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
- export JBOSS_HOME=$JBOSS_INSTANCE
+ rm -rf $WORKSPACE/jboss-as
+ cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as
+ export JBOSS_HOME=$WORKSPACE/jboss-as
+
+ ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_HOME"
}
stopJBoss() {
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
}
startJBoss() {
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
}
copyJBossLogs() {
- cp $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log
- cp $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log
+ cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log
+ cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log
}
copyTestLogs() {
@@ -41,14 +44,14 @@
}
removeJBossLogs() {
- rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log
- rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
+ rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log
+ rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
}
ensureRunningJBoss() {
$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
+ tail -n 100 $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
stopJBoss
copyJBossLogs
exit 1
@@ -126,6 +129,7 @@
}
detectFailures() {
+ rm -rf $WORKSPACE/jboss-as
cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log
if [ -s $WORKSPACE/failure.log ]; then
echo "Failure detected"
13 years, 10 months
JBossWS SVN: r12573 - framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 07:20:29 -0400 (Mon, 05 Jul 2010)
New Revision: 12573
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
Log:
AS-TEST-601 job on Hudson need to run with JBossWS-CXF stack
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 10:56:46 UTC (rev 12572)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 11:20:29 UTC (rev 12573)
@@ -93,8 +93,8 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.native.url@</remote>
- <local>stack-native</local>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
13 years, 10 months
JBossWS SVN: r12572 - framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 06:56:46 -0400 (Mon, 05 Jul 2010)
New Revision: 12572
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
Log:
AS-TEST-601 job on Hudson need to run with JBossWS-CXF stack
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 10:51:54 UTC (rev 12571)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 10:56:46 UTC (rev 12572)
@@ -10,7 +10,7 @@
WORKSPACE=`pwd`
FRAMEWORK_DIR=$WORKSPACE/framework
-STACK_DIR=$WORKSPACE/stack-native
+STACK_DIR=$WORKSPACE/stack-cxf
JBOSS_TARGET=jboss601
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@
13 years, 10 months
JBossWS SVN: r12571 - in stack/native/trunk: modules/core and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 06:51:54 -0400 (Mon, 05 Jul 2010)
New Revision: 12571
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-3006] Fixing dependency on deprecated artifact
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
+++ stack/native/trunk/modules/core/pom.xml 2010-07-05 10:51:54 UTC (rev 12571)
@@ -142,8 +142,8 @@
<artifactId>netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.policy</groupId>
- <artifactId>wscommons-policy</artifactId>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
+++ stack/native/trunk/pom.xml 2010-07-05 10:51:54 UTC (rev 12571)
@@ -360,8 +360,8 @@
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.policy</groupId>
- <artifactId>wscommons-policy</artifactId>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
<version>${wscommons.policy.version}</version>
</dependency>
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-05 10:22:27 UTC (rev 12570)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-05 10:51:54 UTC (rev 12571)
@@ -62,7 +62,6 @@
<include>org.apache:xmlsec:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>commons-beanutils:commons-beanutils:jar</include>
- <include>org.apache.ws.policy:wscommons-policy:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -93,6 +92,13 @@
<include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wscommons-policy.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>ws-commons:policy:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</binaries>
</moduleSet>
13 years, 10 months
JBossWS SVN: r12570 - in stack/cxf/trunk: modules/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 06:22:27 -0400 (Mon, 05 Jul 2010)
New Revision: 12570
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3006] Fixing some dependencies
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-07-05 06:28:08 UTC (rev 12569)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
@@ -214,7 +214,7 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-07-05 06:28:08 UTC (rev 12569)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
@@ -211,9 +211,13 @@
<artifactId>jbosssx</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-05 06:28:08 UTC (rev 12569)
+++ stack/cxf/trunk/pom.xml 2010-07-05 10:22:27 UTC (rev 12570)
@@ -82,6 +82,7 @@
<mail.version>1.4.2</mail.version>
<saaj.api.version>1.0.0.Beta1</saaj.api.version>
<velocity.version>1.5</velocity.version>
+ <xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
<spring.version>3.0.1.RELEASE</spring.version>
@@ -352,6 +353,10 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
@@ -1051,6 +1056,16 @@
<artifactId>jbossxb</artifactId>
<version>${jboss.xb.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId> <!-- Deprecated dependency -->
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId> <!-- Deprecated dependency -->
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -1080,10 +1095,16 @@
<version>${jboss.security.spi.version}</version>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- transitive dependencies -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
13 years, 10 months
JBossWS SVN: r12569 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 02:28:08 -0400 (Mon, 05 Jul 2010)
New Revision: 12569
Modified:
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
Also clean spring specific tests before building src distr in hudson
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-02 16:25:08 UTC (rev 12568)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 06:28:08 UTC (rev 12569)
@@ -102,7 +102,7 @@
deploySourceDistributionWithSpring() {
cd $STACK_DIR
cp profiles.xml.example profiles.xml
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,spring clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist
13 years, 10 months
JBossWS SVN: r12568 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples: wssePolicy and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-02 12:25:08 -0400 (Fri, 02 Jul 2010)
New Revision: 12568
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java
Log:
Remove warnings
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java 2010-07-02 16:20:05 UTC (rev 12567)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java 2010-07-02 16:25:08 UTC (rev 12568)
@@ -51,7 +51,7 @@
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = passwords.get(pc.getIdentifer());
+ String pass = passwords.get(pc.getIdentifier());
if (pass != null)
{
pc.setPassword(pass);
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java 2010-07-02 16:20:05 UTC (rev 12567)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java 2010-07-02 16:25:08 UTC (rev 12568)
@@ -51,7 +51,7 @@
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = passwords.get(pc.getIdentifer());
+ String pass = passwords.get(pc.getIdentifier());
if (pass != null)
{
pc.setPassword(pass);
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java 2010-07-02 16:20:05 UTC (rev 12567)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java 2010-07-02 16:25:08 UTC (rev 12568)
@@ -33,7 +33,7 @@
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if (!("kermit".equals(pc.getIdentifer()) && "thefrog".equals(pc.getPassword())))
- throw new SecurityException("User '" + pc.getIdentifer() + "' with password '" + pc.getPassword() + "' not allowed.");
+ if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword())))
+ throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed.");
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java 2010-07-02 16:20:05 UTC (rev 12567)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java 2010-07-02 16:25:08 UTC (rev 12568)
@@ -33,7 +33,7 @@
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if ("kermit".equals(pc.getIdentifer()))
+ if ("kermit".equals(pc.getIdentifier()))
pc.setPassword("thefrog");
else
pc.setPassword("wrong password");
13 years, 10 months
JBossWS SVN: r12567 - in stack/cxf/trunk: modules/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-02 12:20:05 -0400 (Fri, 02 Jul 2010)
New Revision: 12567
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3006] Update cxf stack dependencies and enforce some exclusions through maven enforcer plugin
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -46,20 +46,10 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
@@ -265,6 +255,49 @@
</plugins>
</build>
-
+ <profiles>
+ <!--
+ Name: enforce
+ Descr: Enforce artifact dependencies
+ -->
+ <profile>
+ <id>enforce</id>
+ <activation>
+ <property>
+ <name>!skip-enforce</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-bad-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <searchTransitive>true</searchTransitive>
+ <excludes>
+ <exclude>org.apache.cxf:cxf-rt-bindings-corba</exclude>
+ <exclude>org.apache.cxf:cxf-rt-javascript</exclude>
+ <exclude>org.apache.geronimo.specs</exclude>
+ <exclude>org.codehaus.jra:jra</exclude>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -33,10 +33,6 @@
<extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry" />
<extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager" />
<extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager" />
- <extension class="org.apache.cxf.binding.corba.CorbaBindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/bindings/corba</namespace>
- <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
- </extension>
<extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<namespace>http://schemas.xmlsoap.org/soap/</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -20,11 +20,6 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <entry key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry>
- <entry key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry>
- <entry key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry>
- <entry key="org.apache.cxf.binding.corba-4">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.AddressType</entry>
- <entry key="org.apache.cxf.binding.corba-5">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.PolicyType</entry>
<entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
<entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
<entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -26,6 +26,10 @@
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
<!-- jbossws dependencies -->
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -59,10 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
@@ -333,5 +333,50 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <!--
+ Name: enforce
+ Descr: Enforce artifact dependencies
+ -->
+ <profile>
+ <id>enforce</id>
+ <activation>
+ <property>
+ <name>!skip-enforce</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-bad-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <searchTransitive>true</searchTransitive>
+ <excludes>
+ <exclude>org.apache.cxf:cxf-rt-bindings-corba</exclude>
+ <exclude>org.apache.cxf:cxf-rt-javascript</exclude>
+ <exclude>org.apache.geronimo.specs</exclude>
+ <exclude>org.codehaus.jra:jra</exclude>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/pom.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -226,8 +226,8 @@
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.codehaus.jra</groupId>
+ <artifactId>jra</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -289,57 +289,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
<exclusions>
@@ -442,6 +391,10 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
@@ -538,9 +491,17 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
@@ -635,6 +596,10 @@
<artifactId>saaj-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-javascript</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
@@ -1068,6 +1033,11 @@
<artifactId>jsr181-api</artifactId>
<version>${jsr181.api.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
@@ -1375,6 +1345,7 @@
<module>modules/testsuite</module>
</modules>
</profile>
+
</profiles>
</project>
13 years, 10 months
JBossWS SVN: r12566 - stack/cxf/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-02 06:04:15 -0400 (Fri, 02 Jul 2010)
New Revision: 12566
Modified:
stack/cxf/trunk/src/main/distro/Install.txt
Log:
[JBWS-3073] Updating installation instructions
Modified: stack/cxf/trunk/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/src/main/distro/Install.txt 2010-07-01 17:39:42 UTC (rev 12565)
+++ stack/cxf/trunk/src/main/distro/Install.txt 2010-07-02 10:04:15 UTC (rev 12566)
@@ -25,6 +25,15 @@
ant -Djboss.server.instance=standard deploy-jboss600
+ By default Spring Framework libraries are not installed to application
+server. In order to do that, please add the -Dspring=true property option when
+running the ant script:
+
+ ant -Dspring=true deploy-jboss600
+
+Please note Spring is required for advanced configuration only, whenever users
+want to provide their own jbossws-cxf.xml Spring configuration file.
+
4.) Execute the samples to verify your installation
'ant tests'
13 years, 10 months