June 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r12554 - in framework/trunk/hudson: hudson-home/jobs/CXF-ALL and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-30 13:14:06 -0400 (Wed, 30 Jun 2010) New Revision: 12554 Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml framework/trunk/hudson/jboss/bin/jbossws-qa.sh Log: [JBWS-3073] Updating hudson jobs Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2010-06-30 16:23:36 UTC (rev 12553) +++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -9,15 +9,30 @@ , CXF-CORE-AS-6.0.0-SUN-JDK-6 , CXF-CORE-AS-6.0.1-SUN-JDK-6 +, CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6 +, CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6 +, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6 + , CXF-BINDIST-AS-5.0.1-SUN-JDK-6 , CXF-BINDIST-AS-5.1.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.1-SUN-JDK-6 +, CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6 +, CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6 +, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6 + , CXF-SRCDIST-AS-5.0.1-SUN-JDK-6 , CXF-SRCDIST-AS-5.1.0-SUN-JDK-6 , CXF-SRCDIST-AS-6.0.0-SUN-JDK-6 , CXF-SRCDIST-AS-6.0.1-SUN-JDK-6 + +, CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6 +, CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6 +, CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss501 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-5.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss510 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-5.1.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +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@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.0.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.0.1 with SpringFramework libraries enabled and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss501 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ against AS-5.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss510 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ against AS-5.1.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +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@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ against AS-6.0.0 with SpringFramework libraires available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ against AS-6.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml 2010-06-30 16:23:36 UTC (rev 12553) +++ framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -9,10 +9,20 @@ , CXF-CORE-AS-6.0.0-SUN-JDK-6 , CXF-CORE-AS-6.0.1-SUN-JDK-6 +, CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6 +, CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6 +, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6 + , CXF-BINDIST-AS-5.0.1-SUN-JDK-6 , CXF-BINDIST-AS-5.1.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.1-SUN-JDK-6 + +, CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6 +, CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6 +, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss501 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-5.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss510 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-5.1.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +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@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.0.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-06-30 17:14:06 UTC (rev 12554) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <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@</remote> + <local>framework</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</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>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/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-06-30 16:23:36 UTC (rev 12553) +++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-06-30 17:14:06 UTC (rev 12554) @@ -59,6 +59,13 @@ mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt } +deployCoreDistributionWithSpring() { + cd $STACK_DIR + cp profiles.xml.example profiles.xml + mvn -Ptestsuite,spring clean + ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET +} + deployCoreDistribution() { cd $STACK_DIR cp profiles.xml.example profiles.xml @@ -79,6 +86,19 @@ ant $ENVIRONMENT deploy-$JBOSS_TARGET } +deploySourceDistributionWithSpring() { + cd $STACK_DIR + cp profiles.xml.example profiles.xml + mvn -Ptestsuite clean + ant $ENVIRONMENT build-src-dist + cd target + rm -rf jbossws-$STACK_ID-src-dist + unzip jbossws-$STACK_ID-src-dist.zip + cd jbossws-$STACK_ID-src-dist + cp profiles.xml.example profiles.xml + ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET +} + deploySourceDistribution() { cd $STACK_DIR cp profiles.xml.example profiles.xml @@ -100,6 +120,10 @@ fi } +runTestsViaMavenWithSpring() { + mvn $ENVIRONMENT -Ptestsuite,hudson,spring,$JBOSS_TARGET $TEST_OPTS test 2>&1 | tee $WORKSPACE/tests.log +} + runTestsViaMaven() { mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $TEST_OPTS test 2>&1 | tee $WORKSPACE/tests.log } @@ -108,6 +132,22 @@ ant $ENVIRONMENT tests-clean tests $TEST_OPTS 2>&1 | tee $WORKSPACE/tests.log } +coreTestWithSpring() { + setupEnv + ensureJavaExists + stopJBoss + deployCoreDistributionWithSpring + removeJBossLogs + startJBoss + ensureRunningJBoss + logMavenDependencies + runTestsViaMavenWithSpring + copyTestLogs + stopJBoss + copyJBossLogs + detectFailures +} + coreTest() { setupEnv ensureJavaExists @@ -124,6 +164,21 @@ detectFailures } +binaryDistributionTestWithSpring() { + setupEnv + ensureJavaExists + stopJBoss + deployBinaryDistributionWithSpring + removeJBossLogs + startJBoss + ensureRunningJBoss + runTestsViaAnt + copyTestLogs + stopJBoss + copyJBossLogs + detectFailures +} + binaryDistributionTest() { setupEnv ensureJavaExists @@ -139,6 +194,22 @@ detectFailures } +sourceDistributionTestWithSpring() { + setupEnv + ensureJavaExists + stopJBoss + deploySourceDistributionWithSpring + removeJBossLogs + startJBoss + ensureRunningJBoss + logMavenDependencies + runTestsViaMavenWithSpring + copyTestLogs + stopJBoss + copyJBossLogs + detectFailures +} + sourceDistributionTest() { setupEnv ensureJavaExists

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12553 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-06-30 12:23:36 -0400 (Wed, 30 Jun 2010) New Revision: 12553 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2596] Enabling JBWS-2074 framework test Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-30 16:15:47 UTC (rev 12552) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-30 16:23:36 UTC (rev 12553) @@ -20,9 +20,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** - # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-30 16:15:47 UTC (rev 12552) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-30 16:23:36 UTC (rev 12553) @@ -20,10 +20,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** - # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-30 16:15:47 UTC (rev 12552) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-30 16:23:36 UTC (rev 12553) @@ -20,9 +20,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** - # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-30 16:15:47 UTC (rev 12552) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-30 16:23:36 UTC (rev 12553) @@ -20,9 +20,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** - # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12552 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-06-30 12:15:47 -0400 (Wed, 30 Jun 2010) New Revision: 12552 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2596] Initial support for EJB/Resources injection, enabling JBWS-2634 framework test Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -87,4 +87,6 @@ { ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint); } + + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.stack.cxf.configuration; +import java.util.List; + import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.SoapTransportFactory; import org.apache.cxf.configuration.Configurer; @@ -30,6 +32,7 @@ import org.apache.cxf.transport.DestinationFactoryManager; import org.jboss.ws.Constants; import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; @@ -89,9 +92,11 @@ * * @param customization The binding customization to set in the configurer, if any * @param wsdlPublisher The wsdl file publisher to set in the configurer, if any + * @param depEndpoints The list of deployment endpoints * @return The new jbossws cxf configurer */ - public abstract Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher); + public abstract Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, + List<Endpoint> depEndpoints); protected static void setInterceptors(Bus bus) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.stack.cxf.configuration; -import java.io.IOException; +import java.util.List; import javax.xml.ws.soap.SOAPBinding; @@ -34,8 +34,9 @@ import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringConfigurer; -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory; import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; @@ -118,11 +119,13 @@ } @Override - public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher) + public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, + List<Endpoint> depEndpoints) { ServerBeanCustomizer customizer = new ServerBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); + customizer.setDeploymentEndpoints(depEndpoints); return new JBossWSNonSpringConfigurer(customizer); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -21,6 +21,11 @@ */ package org.jboss.wsf.stack.cxf.configuration; +import java.util.List; + +import org.apache.cxf.frontend.ServerFactoryBean; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.stack.cxf.AbstractInvoker; import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer; import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; @@ -33,13 +38,33 @@ public class ServerBeanCustomizer extends BeanCustomizer { private WSDLFilePublisher wsdlPublisher; - + private List<Endpoint> depEndpoints; + @Override public void customize(Object beanInstance) { if (beanInstance instanceof EndpointImpl) { configureEndpoint((EndpointImpl)beanInstance); + } + if (beanInstance instanceof ServerFactoryBean) + { + ServerFactoryBean factory = (ServerFactoryBean)beanInstance; + + if (factory.getInvoker() instanceof AbstractInvoker) + { + ((AbstractInvoker)factory.getInvoker()).setTargetBean(factory.getServiceBean()); + } + if (depEndpoints != null) + { + for (Endpoint depEndpoint : depEndpoints) + { + if (depEndpoint.getTargetBeanClass() == factory.getServiceBean().getClass()) + { + depEndpoint.addAttachment(ServerFactoryBean.class, factory); + } + } + } } super.customize(beanInstance); } @@ -58,4 +83,9 @@ this.wsdlPublisher = wsdlPublisher; } + public void setDeploymentEndpoints(List<Endpoint> endpoints) + { + this.depEndpoints = endpoints; + } + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -36,6 +36,7 @@ import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.logging.Logger; import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver; @@ -131,12 +132,14 @@ } @Override - public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher) + public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, + List<Endpoint> depEndpoints) { ApplicationContext ctx = bus.getExtension(BusApplicationContext.class); ServerBeanCustomizer customizer = new ServerBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); + customizer.setDeploymentEndpoints(depEndpoints); JBossWSServerSpringConfigurer serverConfigurer = new JBossWSServerSpringConfigurer(ctx); serverConfigurer.setCustomizer(customizer); return serverConfigurer; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -80,7 +80,8 @@ try { holder = new SpringBusHolder(cxfServletURL, deploymentResolver.resolve(jbosswsCxfXml)); - Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep)); + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), + dep.getService().getEndpoints()); holder.configure(new SoapTransportFactoryExt(), resolver, configurer); } catch (Exception e) @@ -92,7 +93,8 @@ { DDBeans metadata = dep.getAttachment(DDBeans.class); holder = new NonSpringBusHolder(metadata); - Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep)); + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), + dep.getService().getEndpoints()); holder.configure(new SoapTransportFactoryExt(), resolver, configurer); } dep.addAttachment(BusHolder.class, holder); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-06-30 16:15:47 UTC (rev 12552) @@ -23,20 +23,26 @@ import java.io.IOException; import java.lang.reflect.Method; +import java.util.List; import javax.management.ObjectName; +import javax.naming.Context; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.Handler; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.apache.cxf.frontend.ServerFactoryBean; +import org.apache.cxf.jaxws.support.JaxWsEndpointImpl; import org.apache.cxf.management.InstrumentationManager; import org.apache.cxf.management.counters.CounterRepository; import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.common.injection.InjectionHelper; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; @@ -44,6 +50,7 @@ import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData; import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl; /** @@ -92,9 +99,37 @@ throw new WebServiceException("Cannot obtain endpoint for: " + oname); } + //Inject the EJB and JNDI resources if possible + injectServiceAndHandlerResources(endpoint); + + return endpoint; } + private static void injectServiceAndHandlerResources(Endpoint endpoint) + { + ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class); + if (factory != null) + { + InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class); + Context jndiContext = endpoint.getJNDIContext(); + if (factory.getServiceBean() != null) + { + InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext); + InjectionHelper.callPostConstructMethod(factory.getServiceBean()); + } + List<Handler> chain = ((JaxWsEndpointImpl)factory.getServer().getEndpoint()).getJaxwsBinding().getHandlerChain(); + if (chain != null) + { + for (Handler handler : chain) + { + InjectionHelper.injectResources(handler, metadata, jndiContext); + InjectionHelper.callPostConstructMethod(handler); + } + } + } + } + public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus, Endpoint endpoint) throws ServletException { try Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-30 16:15:47 UTC (rev 12552) @@ -22,7 +22,6 @@ # [JBWS-2596] Resource injection in jaxws endpoints and handlers org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-30 16:15:47 UTC (rev 12552) @@ -22,7 +22,6 @@ # [JBWS-2596] Resource injection in jaxws endpoints and handlers org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-30 09:44:32 UTC (rev 12551) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-30 16:15:47 UTC (rev 12552) @@ -22,7 +22,6 @@ # [JBWS-2596] Resource injection in jaxws endpoints and handlers org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** # [JBWS-2561] XOP request not properly inlined org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12551 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-30 05:44:32 -0400 (Wed, 30 Jun 2010) New Revision: 12551 Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringConfigurer.java Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSConfigurer.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: Refactoring JBossWSConfigurer and enabling jaxbintros tests Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSConfigurer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSConfigurer.java 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSConfigurer.java 2010-06-30 09:44:32 UTC (rev 12551) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * Copyright 2010, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -22,56 +22,16 @@ package org.jboss.wsf.stack.cxf.client.configuration; import org.apache.cxf.configuration.Configurer; -import org.apache.cxf.extension.BusExtension; /** - * A CXF configurer that sets JBossWS stuff / customizations / properties etc. in CXF configurable beans + * Interface for JBossWS additions to CXF configurer * * @author alessio.soldano(a)jboss.com - * @since 05-Oct-2009 + * @since 30-Jun-2010 */ -public class JBossWSConfigurer implements Configurer, BusExtension +public interface JBossWSConfigurer extends Configurer { - private BeanCustomizer customizer; + public BeanCustomizer getCustomizer(); - public JBossWSConfigurer(BeanCustomizer customizer) - { - this.customizer = customizer; - } - - @Override - public void configureBean(Object beanInstance) - { - customConfigure(beanInstance); - } - - @Override - public void configureBean(String name, Object beanInstance) - { - customConfigure(beanInstance); - } - - protected synchronized void customConfigure(Object beanInstance) - { - if (customizer != null) - { - customizer.customize(beanInstance); - } - } - - public BeanCustomizer getCustomizer() - { - return customizer; - } - - public void setCustomizer(BeanCustomizer customizer) - { - this.customizer = customizer; - } - - @Override - public Class<?> getRegistrationType() - { - return Configurer.class; - } + public void setCustomizer(BeanCustomizer customizer); } Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-06-30 09:44:32 UTC (rev 12551) @@ -46,7 +46,7 @@ } if (!extensions.containsKey(Configurer.class)) { - extensions.put(Configurer.class, new JBossWSConfigurer(new BeanCustomizer())); + extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer())); } Bus bus = new ExtensionManagerBus(extensions, properties); Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringConfigurer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringConfigurer.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringConfigurer.java 2010-06-30 09:44:32 UTC (rev 12551) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.client.configuration; + +import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.extension.BusExtension; + +/** + * A CXF configurer that sets JBossWS stuff / customizations / properties etc. in CXF configurable beans + * + * @author alessio.soldano(a)jboss.com + * @since 05-Oct-2009 + */ +public class JBossWSNonSpringConfigurer implements JBossWSConfigurer, BusExtension +{ + private BeanCustomizer customizer; + + public JBossWSNonSpringConfigurer(BeanCustomizer customizer) + { + this.customizer = customizer; + } + + @Override + public void configureBean(Object beanInstance) + { + customConfigure(beanInstance); + } + + @Override + public void configureBean(String name, Object beanInstance) + { + customConfigure(beanInstance); + } + + protected synchronized void customConfigure(Object beanInstance) + { + if (customizer != null) + { + customizer.customize(beanInstance); + } + } + + public BeanCustomizer getCustomizer() + { + return customizer; + } + + public void setCustomizer(BeanCustomizer customizer) + { + this.customizer = customizer; + } + + @Override + public Class<?> getRegistrationType() + { + return Configurer.class; + } +} Property changes on: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringConfigurer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java 2010-06-30 09:44:32 UTC (rev 12551) @@ -29,7 +29,7 @@ * @author alessio.soldano(a)jboss.com * @since 05-Oct-2009 */ -public class JBossWSSpringConfigurer extends ConfigurerImpl +public class JBossWSSpringConfigurer extends ConfigurerImpl implements JBossWSConfigurer { private BeanCustomizer customizer; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-06-30 09:44:32 UTC (rev 12551) @@ -34,7 +34,7 @@ import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringConfigurer; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory; import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; @@ -123,7 +123,7 @@ ServerBeanCustomizer customizer = new ServerBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); - return new JBossWSConfigurer(customizer); + return new JBossWSNonSpringConfigurer(customizer); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-06-30 09:44:32 UTC (rev 12551) @@ -36,7 +36,7 @@ import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.binding.JAXBBindingCustomization; -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -54,7 +54,7 @@ private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jaxbintros/EndpointService"; private Bus bus; - private JBossWSSpringConfigurer configurer; + private JBossWSConfigurer configurer; public static Test suite() { @@ -130,7 +130,7 @@ } /** - * Setup binding customization on client side using the JBossWSCXFConfigurer + * Setup binding customization on client side using the JBossWSConfigurer * * @throws Exception */ @@ -141,7 +141,7 @@ BindingCustomizationFactory.populateBindingCustomization(getResourceURL("jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml").openStream(), jaxbCustomizations); bus = BusFactory.getThreadDefaultBus(); - configurer = (JBossWSSpringConfigurer)bus.getExtension(Configurer.class); + configurer = (JBossWSConfigurer)bus.getExtension(Configurer.class); configurer.getCustomizer().setBindingCustomization(jaxbCustomizations); } Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-30 09:44:32 UTC (rev 12551) @@ -60,6 +60,3 @@ # on AS 5.x org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* -# Temporarly exclude jaxbintro stuff (require additional refactoring on -# # # JBossWSConfigurer) -org/jboss/test/ws/jaxws/cxf/jaxbintros/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-30 09:44:32 UTC (rev 12551) @@ -60,6 +60,3 @@ # on AS 5.x org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* -# Temporarly exclude jaxbintro stuff (require additional refactoring on -# # # JBossWSConfigurer) -org/jboss/test/ws/jaxws/cxf/jaxbintros/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-30 09:44:32 UTC (rev 12551) @@ -53,6 +53,3 @@ # [JBWS-3039] Spring 3 classpath scanning fails on AS 6 org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.* -# Temporarly exclude jaxbintro stuff (require additional refactoring on -# JBossWSConfigurer) -org/jboss/test/ws/jaxws/cxf/jaxbintros/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 20:50:53 UTC (rev 12550) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-30 09:44:32 UTC (rev 12551) @@ -53,6 +53,3 @@ # [JBWS-3039] Spring 3 classpath scanning fails on AS 6 org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.* -# Temporarly exclude jaxbintro stuff (require additional refactoring on -# # JBossWSConfigurer) -org/jboss/test/ws/jaxws/cxf/jaxbintros/**

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12550 - spi/tags/jbossws-spi-1.4.0.Beta1.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-29 16:50:53 -0400 (Tue, 29 Jun 2010) New Revision: 12550 Modified: spi/tags/jbossws-spi-1.4.0.Beta1/pom.xml Log: Updating pom.xml Modified: spi/tags/jbossws-spi-1.4.0.Beta1/pom.xml =================================================================== --- spi/tags/jbossws-spi-1.4.0.Beta1/pom.xml 2010-06-29 20:06:02 UTC (rev 12549) +++ spi/tags/jbossws-spi-1.4.0.Beta1/pom.xml 2010-06-29 20:50:53 UTC (rev 12550) @@ -7,7 +7,7 @@ <packaging>jar</packaging> <description>JBossWS SPI</description> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0.Beta1</version>  <parent> @@ -18,9 +18,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-1.4.0...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-1.4.0.Beta1</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-1.4.0.Beta1</url> </scm>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12549 - spi/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-29 16:06:02 -0400 (Tue, 29 Jun 2010) New Revision: 12549 Added: spi/tags/jbossws-spi-1.4.0.Beta1/ Log: Tagging jbossws-spi-1.4.0.Beta1 Copied: spi/tags/jbossws-spi-1.4.0.Beta1 (from rev 12548, spi/trunk)

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12548 - stack/cxf/trunk/modules/testsuite/cxf-spring-tests.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-29 13:56:51 -0400 (Tue, 29 Jun 2010) New Revision: 12548 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/ Log: Updating svn:ignore Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests ___________________________________________________________________ Name: svn:ignore + target

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12546 - in stack/cxf/branches/no-spring-support/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-29 12:41:01 -0400 (Tue, 29 Jun 2010) New Revision: 12546 Added: stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java Modified: stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as5.xml stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as6.xml stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss501.txt stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss510.txt stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss601.txt Log: Use servlet class provider for choosing the transport class depending on spring being available or not Modified: stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java =================================================================== --- stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-06-29 16:37:47 UTC (rev 12545) +++ stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-06-29 16:41:01 UTC (rev 12546) @@ -21,9 +21,8 @@ */ package org.jboss.wsf.stack.cxf.client.util; - - /** + * Utility class for SpringFramework related functions * * @author alessio.soldano(a)jboss.com * @since 16-Jun-2010 Added: stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java =================================================================== --- stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java (rev 0) +++ stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java 2010-06-29 16:41:01 UTC (rev 12546) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.deployment; + +import org.jboss.wsf.spi.deployment.ServletClassProvider; +import org.jboss.wsf.stack.cxf.client.util.SpringUtils; + +public class CXFServletClassProvider implements ServletClassProvider +{ + + @Override + public String getServletClassName() + { + return SpringUtils.isSpringAvailable() ? "org.jboss.wsf.stack.cxf.CXFServletExt" : "org.jboss.wsf.stack.cxf.CXFNonSpringServletExt"; + } + +} Property changes on: stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as5.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2010-06-29 16:37:47 UTC (rev 12545) +++ stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2010-06-29 16:41:01 UTC (rev 12546) @@ -30,8 +30,8 @@ <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry> - <key>stack.transport.class</key> - <value>org.jboss.wsf.stack.cxf.CXFServletExt</value> + <key>stack.transport.class.provider</key> + <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value> </entry> </map> </property> Modified: stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-06-29 16:37:47 UTC (rev 12545) +++ stack/cxf/branches/no-spring-support/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-06-29 16:41:01 UTC (rev 12546) @@ -30,8 +30,8 @@ <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry> - <key>stack.transport.class</key> - <value>org.jboss.wsf.stack.cxf.CXFServletExt</value> + <key>stack.transport.class.provider</key> + <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value> </entry> </map> </property> Modified: stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 16:37:47 UTC (rev 12545) +++ stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 16:41:01 UTC (rev 12546) @@ -59,3 +59,7 @@ # [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available # on AS 5.x org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* + +# Temporarly exclude jaxbintro stuff (require additional refactoring on +# # # JBossWSConfigurer) +org/jboss/test/ws/jaxws/cxf/jaxbintros/** Modified: stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 16:37:47 UTC (rev 12545) +++ stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 16:41:01 UTC (rev 12546) @@ -60,3 +60,6 @@ # on AS 5.x org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* +# Temporarly exclude jaxbintro stuff (require additional refactoring on +# # # JBossWSConfigurer) +org/jboss/test/ws/jaxws/cxf/jaxbintros/** Modified: stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 16:37:47 UTC (rev 12545) +++ stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 16:41:01 UTC (rev 12546) @@ -52,3 +52,7 @@ # [JBWS-3039] Spring 3 classpath scanning fails on AS 6 org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.* + +# Temporarly exclude jaxbintro stuff (require additional refactoring on +# # JBossWSConfigurer) +org/jboss/test/ws/jaxws/cxf/jaxbintros/**

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12545 - stack/cxf/branches/no-spring-support/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-29 12:37:47 -0400 (Tue, 29 Jun 2010) New Revision: 12545 Modified: stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml Log: Explictly tell surefire what classes to use for tests (prevent intermittent failure on framework testsuitprevent intermittent failure on framework testsuite) Modified: stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml 2010-06-29 16:33:18 UTC (rev 12544) +++ stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml 2010-06-29 16:37:47 UTC (rev 12545) @@ -158,6 +158,10 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <failIfNoTests>false</failIfNoTests> + <includes> + <include>**/*Test.java</include> + <include>**/*TestCase.java</include> + </includes> <systemProperties> <property> <name>jboss.server.instance</name>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12544 - container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-06-29 12:33:18 -0400 (Tue, 29 Jun 2010) New Revision: 12544 Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java Log: - [JBWS-3073] add check for servlet class provider parameter when modifying the jbossweb metadata - [JBAS-7902] remove context params propagation (not used anymore) Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2010-06-29 16:18:41 UTC (rev 12543) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2010-06-29 16:33:18 UTC (rev 12544) @@ -22,7 +22,6 @@ package org.jboss.webservices.integration.tomcat; import java.util.List; -import java.util.Map; import org.jboss.logging.Logger; import org.jboss.metadata.javaee.spec.ParamValueMetaData; @@ -34,6 +33,7 @@ import org.jboss.wsf.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.ServletClassProvider; /** * The modifier of jboss web meta data. @@ -66,40 +66,11 @@ { final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class); - this.propagateContextProps(dep, jbossWebMD); this.configureEndpoints(dep, jbossWebMD); this.modifyContextRoot(dep, jbossWebMD); } /** - * Propagates stack specific context parameters if specified. - * - * @param dep webservice deployment - * @param jbossWebMD web meta data - */ - @SuppressWarnings("unchecked") - private void propagateContextProps(final Deployment dep, final JBossWebMetaData jbossWebMD) - { - final Map<String, String> stackContextParams = (Map<String, String>) dep - .getProperty(WSConstants.STACK_CONTEXT_PARAMS); - - if (stackContextParams != null) - { - this.log.debug("Creating context parameters"); - final List<ParamValueMetaData> contextParams = WebMetaDataHelper.getContextParams(jbossWebMD); - - for (Map.Entry<String, String> entry : stackContextParams.entrySet()) - { - final String paramName = entry.getKey(); - final String paramValue = entry.getValue(); - - this.log.debug("Setting context parameter name: " + paramName + " value: " + paramValue); - WebMetaDataHelper.newParamValue(paramName, paramValue, contextParams); - } - } - } - - /** * Configures transport servlet class for every found webservice endpoint. * * @param dep webservice deployment @@ -109,7 +80,7 @@ { final String transportClassName = this.getTransportClassName(dep); final ClassLoader loader = dep.getInitialClassLoader(); - this.log.debug("Modifying servlets"); + this.log.trace("Modifying servlets"); for (final ServletMetaData servletMD : jbossWebMD.getServlets()) { @@ -151,11 +122,29 @@ */ private String getTransportClassName(final Deployment dep) { - final String transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS); + String transportClassName = null; + String transportClassProviderName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS_PROVIDER); + if (transportClassProviderName != null) + { + try + { + ServletClassProvider scp = (ServletClassProvider)(Class.forName(transportClassProviderName).newInstance()); + transportClassName = scp.getServletClassName(); + } + catch (Exception e) + { + log.warn("Cannot get transport class name from " + WSConstants.STACK_TRANSPORT_CLASS_PROVIDER, e); + } + } + + if (transportClassName == null) + { + transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS); + } if (transportClassName == null) { - throw new IllegalStateException("Cannot obtain deployment property: " + WSConstants.STACK_TRANSPORT_CLASS); + throw new IllegalStateException("Cannot obtain deployment property : " + WSConstants.STACK_TRANSPORT_CLASS); } return transportClassName;

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2010