February 2015 - jbossws-commits - Jboss List Archives

JBossWS SVN: r19444 - in hudson/trunk: hudson-home and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-02-10 08:34:33 -0500 (Tue, 10 Feb 2015) New Revision: 19444 Added: hudson/trunk/hudson-home/jobs/AS-8.2.0-SECMGR/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-SECMGR/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0/ Removed: hudson/trunk/hudson-home/jobs/AS-8.0.0/ hudson/trunk/hudson-home/jobs/AS-8.1.0/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.1.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.1.0/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/ hudson/trunk/hudson-home/jobs/CXF-LIGHT/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/ Modified: hudson/trunk/ hudson/trunk/ant.properties.example hudson/trunk/build.xml hudson/trunk/hudson-home/config.xml hudson/trunk/hudson-home/jobs/AS-ALL/config.xml hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml hudson/trunk/scripts/jbossws-qa.sh Log: svn merge -r 19144:HEAD https://svn.jboss.org/repos/jbossws/hudson/branches/arquillian . Property changes on: hudson/trunk ___________________________________________________________________ Added: svn:mergeinfo + /hudson/branches/arquillian:19145-19443 Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/ant.properties.example 2015-02-10 13:34:33 UTC (rev 19444) @@ -17,7 +17,7 @@ hudson.admin.port=8150 hudson.http.port=8180 -hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk +hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/arquillian hudson.jboss800.url=https://github.com/wildfly/wildfly hudson.jboss800.build=wildfly-8.0.0.Final @@ -27,6 +27,10 @@ hudson.jboss810.build=wildfly-8.1.0.Final hudson.jboss810.rev=8.1.0.Final +hudson.jboss820.url=https://github.com/wildfly/wildfly +hudson.jboss820.build=wildfly-8.2.0.Final +hudson.jboss820.rev=8.2.0.Final + hudson.jboss900.url=https://github.com/wildfly/wildfly hudson.jboss900.build=wildfly-9.0.0.Alpha2-SNAPSHOT hudson.jboss900.rev=master Modified: hudson/trunk/build.xml =================================================================== --- hudson/trunk/build.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/build.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -61,7 +61,7 @@ <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> <get src="http://archive.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bin/apac..." dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> - <get src="http://hudson-ci.org/downloads/war/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + <get src="http://hudson-ci.org/downloads/war/archived/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> <get src="http://hudson-ci.org/downloads/plugins/git/${git-plugin}/git.hpi" dest="${thirdparty.dir}/git.hpi" usetimestamp="true" verbose="true"/> <mkdir dir="${hudson.root}"/> Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -37,6 +37,7 @@ <tr><td colspan=2></td></tr> <tr><th align=left>@hudson.jboss800.build@</th><td>-r(a)hudson.jboss800.rev@ @hudson.jboss800.url@</td></tr> <tr><th align=left>@hudson.jboss810.build@</th><td>-r(a)hudson.jboss810.rev@ @hudson.jboss810.url@</td></tr> + <tr><th align=left>@hudson.jboss820.build@</th><td>-r(a)hudson.jboss820.rev@ @hudson.jboss820.url@</td></tr> <tr><th align=left>@hudson.jboss900.build@</th><td>-r(a)hudson.jboss900.rev@ @hudson.jboss900.url@</td></tr> <tr><td colspan=2></td></tr> </table> @@ -54,10 +55,9 @@ <no-comparator/> <string>AS-ALL</string> <string>AS-LIGHT</string> - <string>AS-8.0.0</string> <string>AS-8.0.0-SECMGR</string> - <string>AS-8.1.0</string> <string>AS-8.1.0-SECMGR</string> + <string>AS-8.2.0-SECMGR</string> <string>AS-9.0.0</string> <string>AS-9.0.0-SECMGR</string> </jobNames> @@ -75,28 +75,18 @@ <jobNames class="tree-set"> <no-comparator/> <string>CXF-ALL</string> - <string>CXF-LIGHT</string> - <string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.0.0</string> <string>CXF-CORE-AS-8.0.0-SECMGR</string> - <string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.1.0</string> + <string>CXF-CORE-AS-8.2.0</string> <string>CXF-CORE-AS-8.1.0-SECMGR</string> - <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.2.0-SECMGR</string> + <string>CXF-CORE-AS-9.0.0</string> <string>CXF-CORE-AS-9.0.0-SECMGR</string> - <string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-9.0.0-SPRING-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.0.0-SPRING</string> + <string>CXF-CORE-AS-8.1.0-SPRING</string> + <string>CXF-CORE-AS-8.2.0-SPRING</string> + <string>CXF-CORE-AS-9.0.0-SPRING</string> </jobNames> <name>CXF Tests</name> <description> @@ -108,37 +98,5 @@ </description> </view> -  - <view> - <owner reference="../../.."/> - <jobNames class="tree-set"> - <no-comparator/> - <string>CXF-LIGHT</string> - <string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.0.0-SECMGR</string> - <string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-CORE-AS-9.0.0-SECMGR</string> - <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.1.0-SECMGR</string> - <string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string> - </jobNames> - <name>Working Days Tests</name> - <description> - <![CDATA[ - Run the working days tests; these include Core and Distro tests for all stacks. - <p/> - Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> -]]> - </description> - </view> - </views> </hudson> Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-8.0.0, AS-8.1.0, AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects> + <childProjects>AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-8.2.0-SECMGR, AS-9.0.0-SECMGR</childProjects> <threshold> <name>UNSTABLE</name> <ordinal>1</ordinal> Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -8,43 +8,25 @@ , CXF-CORE-AS-8.1.0 +, CXF-CORE-AS-8.2.0 + , CXF-CORE-AS-9.0.0 , CXF-CORE-AS-8.0.0-SPRING , CXF-CORE-AS-8.1.0-SPRING +, CXF-CORE-AS-8.2.0-SPRING + , CXF-CORE-AS-9.0.0-SPRING , CXF-CORE-AS-8.0.0-SECMGR , CXF-CORE-AS-8.1.0-SECMGR -, CXF-CORE-AS-9.0.0-SECMGR +, CXF-CORE-AS-8.2.0-SECMGR -, CXF-BINDIST-AS-8.0.0 - -, CXF-BINDIST-AS-8.1.0 - -, CXF-BINDIST-AS-9.0.0 - -, CXF-BINDIST-AS-8.0.0-SPRING - -, CXF-BINDIST-AS-8.1.0-SPRING - -, CXF-BINDIST-AS-9.0.0-SPRING - -, CXF-SRCDIST-AS-8.0.0 - -, CXF-SRCDIST-AS-8.1.0 - -, CXF-SRCDIST-AS-9.0.0 - -, CXF-SRCDIST-AS-8.0.0-SPRING - -, CXF-SRCDIST-AS-8.1.0-SPRING - -, CXF-SRCDIST-AS-9.0.0-SPRING +, CXF-CORE-AS-9.0.0-SECMGR </childProjects> <threshold> <name>UNSTABLE</name> Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly800 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly800 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0-SECMGR/workspace/build/target/(a)hudson.jboss800.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly800 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly810 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/(a)hudson.jboss810.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly810 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0-SECMGR/workspace/build/target/(a)hudson.jboss810.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly810 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/(a)hudson.jboss810.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly900 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly900 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/dist/target/(a)hudson.jboss900.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly900 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # Modified: hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-LIGHT, CXF-LIGHT</childProjects> + <childProjects>AS-LIGHT, CXF-ALL</childProjects> <threshold> <name>UNSTABLE</name> <ordinal>1</ordinal> Modified: hudson/trunk/scripts/jbossws-qa.sh =================================================================== --- hudson/trunk/scripts/jbossws-qa.sh 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/scripts/jbossws-qa.sh 2015-02-10 13:34:33 UTC (rev 19444) @@ -7,14 +7,6 @@ fi } -setupJBossHome() { - rm -rf $WORKSPACE/jboss-as - cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as - export JBOSS_HOME=$WORKSPACE/jboss-as - echo "Overwriting default application-users.properties / application-roles.properties on AS..." - cp $STACK_DIR/etc/application-*.properties $JBOSS_HOME/standalone/configuration -} - setupEnv() { TMP_DIR_PROPERTY= if [ -d /data/tmp ]; then @@ -25,114 +17,27 @@ echo "Cannot detect temporary directory"; 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_HOME" + if [ "$JBOSS_INSTANCE" != "" ]; then + 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 -Dserver.home=$JBOSS_HOME" + else + ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U" + fi } -stopJBoss() { - $SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS +logMavenDependencies() { + cd $STACK_DIR + mvn -Ptestsuite,spring,dist clean + mvn -P$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt } -startJBoss() { - $SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS -} - -copyJBossLogs() { - if [ -e $JBOSS_HOME/standalone/log/boot.log ]; then - cp $JBOSS_HOME/standalone/log/boot.log $WORKSPACE/jboss-boot.log - fi - cp $JBOSS_HOME/standalone/log/server.log $WORKSPACE/jboss-server.log -} - copyTestLogs() { cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt cat $STACK_DIR/modules/dist/target/exclude-file/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt } -removeJBossLogs() { - rm -f $JBOSS_HOME/standalone/log/boot.log - rm -f $JBOSS_HOME/standalone/log/server.log -} - -ensureRunningJBoss() { - $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE - if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_HOME/standalone/log/server.log - stopJBoss - copyJBossLogs - exit 1 - fi -# sleep 5 -} - -logMavenDependencies() { - mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt -} - -deployCoreDistributionWithSpring() { - cd $STACK_DIR - mvn -Ptestsuite,dist,spring clean - ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET -} - -deployCoreDistribution() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT deploy-$JBOSS_TARGET -} - -deployBinaryDistributionWithSpring() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT build-bin-dist - cd target - rm -rf jbossws-$STACK_ID-bin-dist - unzip jbossws-$STACK_ID-bin-dist.zip - cd jbossws-$STACK_ID-bin-dist - cp ant.properties.example ant.properties - ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET -} - -deployBinaryDistribution() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT build-bin-dist - cd target - rm -rf jbossws-$STACK_ID-bin-dist - unzip jbossws-$STACK_ID-bin-dist.zip - cd jbossws-$STACK_ID-bin-dist - cp ant.properties.example ant.properties - 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 - mvn -Ptestsuite,dist,spring 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 - ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET -} - -deploySourceDistribution() { - cd $STACK_DIR - mvn -Ptestsuite,dist 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 - ant $ENVIRONMENT deploy-$JBOSS_TARGET -} - detectFailures() { #rm -rf $WORKSPACE/jboss-as cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|BUILD ERROR|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log @@ -143,123 +48,30 @@ } runTestsViaMavenWithSpring() { - mvn $ENVIRONMENT -Ptestsuite,hudson,spring,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log + mvn $ENVIRONMENT -Phudson,spring,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log } runTestsViaMaven() { - mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log + mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log } -runTestsViaAnt() { - ant $ENVIRONMENT tests-clean tests $TEST_OPTS 2>&1 | tee $WORKSPACE/tests.log -} - -addTestQueue() { - if [ "$JBOSS_TARGET" != "jboss710" ] && [ "$JBOSS_TARGET" != "jboss711" ]; then - sleep 10 - $JBOSS_HOME/bin/jboss-cli.sh -c command="/subsystem=messaging/hornetq-server=default/jms-queue=testQueue/:add(entries=[\"queue/test\",\"java:jboss/exported/jms/queue/test\"])" - fi -} - coreTestWithSpring() { - setupJBossHome setupEnv ensureJavaExists - stopJBoss - deployCoreDistributionWithSpring - removeJBossLogs - startJBoss - ensureRunningJBoss - addTestQueue +# addTestQueue TODO logMavenDependencies runTestsViaMavenWithSpring copyTestLogs - stopJBoss - copyJBossLogs detectFailures } coreTest() { - setupJBossHome setupEnv ensureJavaExists - stopJBoss - deployCoreDistribution - removeJBossLogs - startJBoss - ensureRunningJBoss logMavenDependencies runTestsViaMaven copyTestLogs - stopJBoss - copyJBossLogs detectFailures } -binaryDistributionTestWithSpring() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deployBinaryDistributionWithSpring - removeJBossLogs - startJBoss - ensureRunningJBoss - addTestQueue - runTestsViaAnt - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -} -binaryDistributionTest() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deployBinaryDistribution - removeJBossLogs - startJBoss - ensureRunningJBoss - runTestsViaAnt - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -} - -sourceDistributionTestWithSpring() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deploySourceDistributionWithSpring - removeJBossLogs - startJBoss - ensureRunningJBoss - addTestQueue - logMavenDependencies - runTestsViaMavenWithSpring - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -} - -sourceDistributionTest() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deploySourceDistribution - removeJBossLogs - startJBoss - ensureRunningJBoss - logMavenDependencies - runTestsViaMaven - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -}

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19443 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-02-09 12:20:16 -0500 (Mon, 09 Feb 2015) New Revision: 19443 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java Removed: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java Log: [JBWS-3668] Fix previous commit Copied: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java (from rev 19441, stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-02-09 17:20:16 UTC (rev 19443) @@ -0,0 +1,177 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.test.ws.jaxws.jbws2307; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +import org.jboss.arquillian.container.test.api.Deployer; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * [JBWS-2307] / [JBWS-2997] testcase + * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException + * + * @author alessio.soldano(a)jboss.com + */ +(a)RunWith(Arquillian.class) +public class JBWS2307MTOMTestCase extends JBossWSTest +{ + public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service"; + public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client"; + public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2"; + public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3"; + + @ArquillianResource + private URL baseURL; + + @ArquillianResource + Deployer deployer; + + @Deployment(name = SERVER_DEPLOYMENT, order=1, testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml")); + return archive; + } + + @Deployment(name = CLIENT_DEPLOYMENT, order=2, testable = false) + public static WebArchive createDeployment4() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml")); + return archive; + } + + @Deployment(name = CLIENT_3_DEPLOYMENT, testable = false, managed = false) + public static WebArchive createDeployment3() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml")); + return archive; + } + + @Deployment(name = CLIENT_2_DEPLOYMENT, testable = false, managed = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml")); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEPLOYMENT) + public void testMTOM() throws Exception + { + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); + } + + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEPLOYMENT) + public void testClient() throws Exception + { + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307").openConnection(); + BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); + assertEquals("true", isr.readLine()); + } + + @Test + @RunAsClient + @OperateOnDeployment(SERVER_DEPLOYMENT) + public void testUsingClientArchive3() throws Exception + { + try { + deployer.deploy(CLIENT_3_DEPLOYMENT); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307").openConnection(); + BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); + assertEquals("true", isr.readLine()); + } finally { + deployer.undeploy(CLIENT_3_DEPLOYMENT); + } + } + + @Test + @RunAsClient + @OperateOnDeployment(SERVER_DEPLOYMENT) + public void testUsingClientArchive2() throws Exception + { + try { + deployer.deploy(CLIENT_2_DEPLOYMENT); + URL url = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-2/jbws2307?mtom=true"); + final HttpURLConnection c = (HttpURLConnection)url.openConnection(); + c.connect(); + assertEquals(500, c.getResponseCode()); + String error = IOUtils.readAndCloseStream(c.getErrorStream()); + c.disconnect(); + if (error.contains("error-text-div")) { //the actual error exception does not seem to be always returned by web layer + assertTrue(error.contains("Could not instantiate ClientServlet2")); + } + } finally { + deployer.undeploy(CLIENT_2_DEPLOYMENT); + } + } +} Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-02-09 17:18:38 UTC (rev 19442) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-02-09 17:20:16 UTC (rev 19443) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2014, 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.test.ws.jaxws.jbws2307; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException - * - * @author alessio.soldano(a)jboss.com - */ -public class WebServiceRefMTOMTestCase extends JBossWSTest -{ - - public static Test suite() - { - return new JBossWSTestSetup(WebServiceRefMTOMTestCase.class, DeploymentArchives.SERVER, true); - } - - public void testUsingClientArchive3() throws Exception - { - try { - JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_3); - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); - } finally { - JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_3); - } - } - - public void testUsingClientArchive2() throws Exception - { - try { - JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_2); - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true"); - final HttpURLConnection c = (HttpURLConnection)url.openConnection(); - c.connect(); - assertEquals(500, c.getResponseCode()); - String error = IOUtils.readAndCloseStream(c.getErrorStream()); - c.disconnect(); - if (error.contains("error-text-div")) { //the actual error exception does not seem to be always returned by web layer - assertTrue(error.contains("Could not instantiate ClientServlet2")); - } - } finally { - JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_2); - } - } -}

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19442 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-02-09 12:18:38 -0500 (Mon, 09 Feb 2015) New Revision: 19442 Removed: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java Log: [JBWS-3668] forgot to delete an old test Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-02-09 16:44:34 UTC (rev 19441) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-02-09 17:18:38 UTC (rev 19442) @@ -1,177 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.test.ws.jaxws.jbws2307; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import org.jboss.arquillian.container.test.api.Deployer; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * [JBWS-2307] / [JBWS-2997] testcase - * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException - * - * @author alessio.soldano(a)jboss.com - */ -(a)RunWith(Arquillian.class) -public class JBWS2307MTOMTestCase extends JBossWSTest -{ - public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service"; - public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client"; - public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2"; - public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3"; - - @ArquillianResource - private URL baseURL; - - @ArquillianResource - Deployer deployer; - - @Deployment(name = SERVER_DEPLOYMENT, order=1, testable = false) - public static WebArchive createDeployment() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml")); - return archive; - } - - @Deployment(name = CLIENT_DEPLOYMENT, order=2, testable = false) - public static WebArchive createDeployment4() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml")); - return archive; - } - - @Deployment(name = CLIENT_3_DEPLOYMENT, testable = false, managed = false) - public static WebArchive createDeployment3() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml")); - return archive; - } - - @Deployment(name = CLIENT_2_DEPLOYMENT, testable = false, managed = false) - public static WebArchive createDeployment2() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml")); - return archive; - } - - @Test - @RunAsClient - @OperateOnDeployment(CLIENT_DEPLOYMENT) - public void testMTOM() throws Exception - { - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); - } - - @Test - @RunAsClient - @OperateOnDeployment(CLIENT_DEPLOYMENT) - public void testClient() throws Exception - { - HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); - } - - @Test - @RunAsClient - @OperateOnDeployment(SERVER_DEPLOYMENT) - public void testUsingClientArchive3() throws Exception - { - try { - deployer.deploy(CLIENT_3_DEPLOYMENT); - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); - HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); - } finally { - deployer.undeploy(CLIENT_3_DEPLOYMENT); - } - } - - @Test - @RunAsClient - @OperateOnDeployment(SERVER_DEPLOYMENT) - public void testUsingClientArchive2() throws Exception - { - try { - deployer.deploy(CLIENT_2_DEPLOYMENT); - URL url = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-2/jbws2307?mtom=true"); - final HttpURLConnection c = (HttpURLConnection)url.openConnection(); - c.connect(); - assertEquals(500, c.getResponseCode()); - String error = IOUtils.readAndCloseStream(c.getErrorStream()); - c.disconnect(); - if (error.contains("error-text-div")) { //the actual error exception does not seem to be always returned by web layer - assertTrue(error.contains("Could not instantiate ClientServlet2")); - } - } finally { - deployer.undeploy(CLIENT_2_DEPLOYMENT); - } - } -}

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19440 - hudson/branches/arquillian/scripts.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-02-09 08:46:39 -0500 (Mon, 09 Feb 2015) New Revision: 19440 Modified: hudson/branches/arquillian/scripts/jbossws-qa.sh Log: Properly clean up sources (also clean stuff in cxf-spring-tests) Modified: hudson/branches/arquillian/scripts/jbossws-qa.sh =================================================================== --- hudson/branches/arquillian/scripts/jbossws-qa.sh 2015-02-09 11:02:14 UTC (rev 19439) +++ hudson/branches/arquillian/scripts/jbossws-qa.sh 2015-02-09 13:46:39 UTC (rev 19440) @@ -29,7 +29,7 @@ logMavenDependencies() { cd $STACK_DIR - mvn -Ptestsuite,dist clean + mvn -Ptestsuite,spring,dist clean mvn -P$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19439 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws: cxf/descriptor and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-02-09 06:02:14 -0500 (Mon, 09 Feb 2015) New Revision: 19439 Removed: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java Log: Removing unused imports and files Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -23,8 +23,6 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -32,18 +30,14 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; - /** * To test configure bean by name auto wire * Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -63,8 +63,8 @@ return archive; } - @Test - @RunAsClient + @Test + @RunAsClient public void testLegalAccess() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -20,8 +20,6 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.test.ws.jaxws.cxf.in_container_client; -import static org.jboss.wsf.stack.cxf.client.Constants.JBWS_CXF_JAXWS_CLIENT_BUS_SELECTOR; - import java.io.File; import java.net.URL; Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -25,7 +25,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -38,18 +37,14 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; - /** * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue. * This testcase basically verifies the initial workaround for the issue works. Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -23,8 +23,6 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -32,17 +30,13 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; - @RunWith(Arquillian.class) public class JBWS3670TestCase extends JBossWSTest { Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2014, 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.test.ws.jaxws.cxf.wsrm; - -import java.io.File; - -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class DeploymentArchives -{ - public static final String RPC_SERVER = - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-wsrm-basic-rpc.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml")); - } - }); - - public static final String DOC_SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-wsrm-basic-doc.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml")); - } - }); - - public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-wsrm-basic-client.jar") { { - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/cxf.xml"), "cxf.xml"); - } - }); - - public DeploymentArchives() { - //NOOP - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -24,33 +24,26 @@ import java.io.File; import java.net.URL; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback; -import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * WS-Security username authorization test case @@ -86,27 +79,6 @@ return archive; } - /*** - public static Test suite() - { - JBossWSCXFTestSetup testSetup; - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - return testSetup; - } - ***/ @Test @RunAsClient public void testAuthorized() throws Exception Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -24,32 +24,26 @@ import java.io.File; import java.net.URL; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; - /** * Secure EJB endpoint test * Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -37,7 +37,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,24 +71,6 @@ return archive; } - /**** - public static Test suite() - { - // System properties - currently set at testsuite start time - //System.setProperty("javax.net.ssl.trustStore", "my.truststore"); - //System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); - //System.setProperty("javax.net.ssl.trustStoreType", "jks"); - //System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); - // - JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("server-identity.ssl.keystore-password", "changeit"); - sslOptions.put("server-identity.ssl.alias", "tomcat"); - setup.setHttpsConnectorRequirement(sslOptions); - return setup; - } - *****/ @Test @RunAsClient public void test() throws Exception @@ -124,6 +105,12 @@ private void setupWsse(ServiceIface proxy, String username) { + // System properties - currently set at testsuite start time + //System.setProperty("javax.net.ssl.trustStore", "my.truststore"); + //System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); + //System.setProperty("javax.net.ssl.trustStoreType", "jks"); + //System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); + // ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, username); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wssePolicy.UsernamePasswordCallback"); }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19438 - projects/plugins/maven/jaxws-tools/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-02-09 05:30:36 -0500 (Mon, 09 Feb 2015) New Revision: 19438 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml Log: Move out of snapshots for jbossws-common-tools Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2015-02-09 06:32:10 UTC (rev 19437) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2015-02-09 10:30:36 UTC (rev 19438) @@ -26,7 +26,7 @@  <properties> - <jbossws.common.tools.version>1.2.1-SNAPSHOT</jbossws.common.tools.version> + <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <getopt.version>1.0.13</getopt.version> <log4j.version>1.2.14</log4j.version> <maven.project.version>2.2.1</maven.project.version>

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19437 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-02-09 01:32:10 -0500 (Mon, 09 Feb 2015) New Revision: 19437 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy Log: Fix groovy NPE for wildfly800 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-02-08 20:27:48 UTC (rev 19436) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-02-09 06:32:10 UTC (rev 19437) @@ -109,6 +109,9 @@ **/ def hornetqServer = root.profile.subsystem.'hornetq-server'[0] def jmsDestinations = hornetqServer.'jms-destinations'[0] +if (jmsDestinations == null) { + jmsDestinations = hornetqServer.appendNode('jms-destinations'); +} def jmsQueue = jmsDestinations.appendNode('jms-queue', ['name':'testQueue']) jmsQueue.appendNode('entry', ['name':'queue/test']) jmsQueue.appendNode('entry', ['name':'java:jboss/exported/jms/queue/test']) @@ -134,4 +137,4 @@ def srcRolesProperties = project.properties['srcRolesProperties'] def destRolesProperties = project.properties['destRolesProperties'] new AntBuilder().copy( file:srcRolesProperties, - tofile:destRolesProperties) \ No newline at end of file + tofile:destRolesProperties)

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19436 - projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2015-02-08 15:27:48 -0500 (Sun, 08 Feb 2015) New Revision: 19436 Added: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/UrlUtils.java Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java Log: [JBWS-3824] code added to generate manifest-only jar file for both wsprovide and wsconsume. Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2015-01-29 07:09:24 UTC (rev 19435) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -22,11 +22,16 @@ package org.jboss.ws.plugins.tools; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; @@ -72,7 +77,7 @@ * @parameter default-value="false" */ protected Boolean fork; - + /** * Either ${build.outputDirectory} or ${build.testOutputDirectory}. */ @@ -164,5 +169,47 @@ { return fork; } - + + /** + * Create a jar with just a manifest containing a Main-Class entry and a Class-Path entry + * for all classpath elements. + * + * @param classPath List<String> of all classpath elements. + * @param startClassName The classname to start (main-class) + * @return The file pointint to the jar + * @throws java.io.IOException When a file operation fails. + */ + public File createJar( List<String> classPath, String startClassName ) + throws IOException + { + File tempDirectory = getOutputDirectory(); + tempDirectory.mkdirs(); + File file = File.createTempFile( "jbosswsJaxwsTools", ".jar", tempDirectory ); + + FileOutputStream fos = new FileOutputStream( file ); + JarOutputStream jos = new JarOutputStream( fos ); + jos.setLevel( JarOutputStream.STORED ); + JarEntry je = new JarEntry( "META-INF/MANIFEST.MF" ); + jos.putNextEntry( je ); + + Manifest man = new Manifest(); + + // we can't use StringUtils.join here since we need to add a '/' to + // the end of directory entries - otherwise the jvm will ignore them. + String cp = ""; + for ( String el : classPath ) + { + // NOTE: if File points to a directory, this entry MUST end in '/'. + cp += UrlUtils.getURL(new File(el)).toExternalForm() + " "; + } + + man.getMainAttributes().putValue( "Manifest-Version", "1.0" ); + man.getMainAttributes().putValue( "Class-Path", cp.trim() ); + man.getMainAttributes().putValue( "Main-Class", startClassName ); + + man.write( jos ); + jos.close(); + + return file; + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2015-01-29 07:09:24 UTC (rev 19435) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -148,6 +148,10 @@ params.setEncoding(encoding); params.setArgLine(argLine); params.setFork(fork); + + File manifestOnlyJar = createJar(getClasspathElements(), ""); + params.setManifestOnlyJar(manifestOnlyJar); + WSContractDelegate delegate = new WSContractDelegate(getLog()); for (String wsdl : wsdls) @@ -167,6 +171,10 @@ } updateProjectSourceRoots(); } + catch (java.io.IOException ioe) + { + throw new MojoExecutionException("Error while running wsconsume", ioe); + } finally { Thread.currentThread().setContextClassLoader(origLoader); Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2015-01-29 07:09:24 UTC (rev 19435) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -92,7 +92,7 @@ log.info(" " + s); } } - + ClassLoader origLoader = Thread.currentThread().getContextClassLoader(); URLClassLoader loader = getMavenClasspathAwareClassLoader(); Thread.currentThread().setContextClassLoader(loader); @@ -110,7 +110,10 @@ params.setFork(fork); params.setArgLine(argLine); params.setPortSoapAddress(portSoapAddress); - + + File manifestOnlyJar = createJar(getClasspathElements(), endpointClass); + params.setManifestOnlyJar(manifestOnlyJar); + WSContractDelegate delegate = new WSContractDelegate(getLog()); delegate.runProvider(params); Added: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/UrlUtils.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/UrlUtils.java (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/UrlUtils.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -0,0 +1,99 @@ +/* + * 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.ws.plugins.tools; + +import java.io.File; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.BitSet; + +/** + * Utility for dealing with URLs in pre-JDK 1.4. + * + * User: rsearls + * Date: 2/6/15 + */ +public class UrlUtils { + private static final BitSet UNRESERVED = new BitSet( Byte.MAX_VALUE - Byte.MIN_VALUE + 1 ); + + private static final int RADIX = 16; + + private static final int MASK = 0xf; + + private UrlUtils() + { + } + + private static final String ENCODING = "UTF-8"; + + static + { + try + { + byte[] bytes = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'():/".getBytes( ENCODING ); + for ( byte aByte : bytes ) + { + UNRESERVED.set( aByte ); + } + } + catch ( UnsupportedEncodingException e ) + { + // can't happen as UTF-8 must be present + } + } + + public static URL getURL( File file ) + throws MalformedURLException + { + // with JDK 1.4+, code would be: return new URL( file.toURI().toASCIIString() ); + //noinspection deprecation + URL url = file.toURL(); + // encode any characters that do not comply with RFC 2396 + // this is primarily to handle Windows where the user's home directory contains spaces + try + { + byte[] bytes = url.toString().getBytes( ENCODING ); + StringBuilder buf = new StringBuilder( bytes.length ); + for ( byte b : bytes ) + { + if ( b > 0 && UNRESERVED.get( b ) ) + { + buf.append( (char) b ); + } + else + { + buf.append( '%' ); + buf.append( Character.forDigit( b >>> 4 & MASK, RADIX ) ); + buf.append( Character.forDigit( b & MASK, RADIX ) ); + } + } + return new URL( buf.toString() ); + } + catch ( UnsupportedEncodingException e ) + { + // should not happen as UTF-8 must be present + throw new RuntimeException( e ); + } + } +} Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2015-01-29 07:09:24 UTC (rev 19435) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -43,7 +43,8 @@ private String wsdlLocation; private String encoding; private String argLine; - + private File manifestOnlyJar; + public boolean isAdditionalHeaders() { return additionalHeaders; @@ -172,4 +173,14 @@ { this.sourceDirectory = sourceDirectory; } + + public File getManifestOnlyJar() + { + return manifestOnlyJar; + } + + public void setManifestOnlyJar(File manifestOnlyJar) + { + this.manifestOnlyJar = manifestOnlyJar; + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2015-01-29 07:09:24 UTC (rev 19435) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -68,13 +68,7 @@ private void runProviderOutOfProcess(WSContractProviderParams params) throws Exception { - List<String> classpath = new LinkedList<String>(); - URL[] urls = params.getLoader().getURLs(); - for (URL url : urls) - { - classpath.add(url.getFile()); - } - List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.ws.tools.cmd.WSProvide"); + List<String> commandList = initCommandList(params.getArgLine(), params.getManifestOnlyJar(), "org.jboss.ws.tools.cmd.WSProvide"); String commandLine = getProviderCommandLine(commandList, params); if (log.isDebugEnabled()) @@ -116,13 +110,7 @@ private void runConsumerOutOfProcess(WSContractConsumerParams params, String wsdl) throws Exception { - List<String> classpath = new LinkedList<String>(); - URL[] urls = params.getLoader().getURLs(); - for (URL url : urls) - { - classpath.add(url.getFile()); - } - List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.ws.tools.cmd.WSConsume"); + List<String> commandList = initCommandList(params.getArgLine(), params.getManifestOnlyJar(), "org.jboss.ws.tools.cmd.WSConsume"); String commandLine = getConsumerCommandLine(commandList, params, wsdl); if (log.isDebugEnabled()) @@ -140,6 +128,14 @@ } } + /** + * Write list of archives on the command-line + * + * @param argLine + * @param classpath + * @param toolClass + * @return + */ private static List<String> initCommandList(String argLine, List<String> classpath, String toolClass) { List<String> commandList = new ArrayList<String>(); @@ -165,6 +161,29 @@ return commandList; } + /** + * Write manifest-only jar to the command-line + * + * @param argLine + * @param manifestOnlyJar + * @param toolClass + * @return + * @throws Exception + */ + private static List<String> initCommandList(String argLine, File manifestOnlyJar, String toolClass) throws Exception + { + List<String> commandList = new ArrayList<String>(); + commandList.add("java"); + if (argLine != null) + { + commandList.add(argLine); + } + commandList.add("-classpath "); + commandList.add(manifestOnlyJar.getCanonicalPath()); + commandList.add(toolClass); + return commandList; + } + private static String getConsumerCommandLine(List<String> commandList, WSContractConsumerParams params, String wsdl) { List<String> bindingFiles = params.getBindingFiles(); Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2015-01-29 07:09:24 UTC (rev 19435) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2015-02-08 20:27:48 UTC (rev 19436) @@ -38,6 +38,7 @@ private File sourceDirectory; private String argLine; private String portSoapAddress; + private File manifestOnlyJar; public boolean isFork() { @@ -128,4 +129,15 @@ { this.portSoapAddress = portSoapAddress; } + + public File getManifestOnlyJar() + { + return manifestOnlyJar; + } + + public void setManifestOnlyJar(File manifestOnlyJar) + { + this.manifestOnlyJar = manifestOnlyJar; + } } +

9 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 February 2015