August 2010 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-31 09:20:26 -0400 (Tue, 31 Aug 2010) New Revision: 12881 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 Log: fixing all excludes Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-08-31 12:32:51 UTC (rev 12880) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-08-31 13:20:26 UTC (rev 12881) @@ -39,12 +39,8 @@ org/jboss/test/ws/jaxrpc/** # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/jbws2960/** -org/jboss/test/ws/jaxws/jbws2991/** -org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/jbws3031/** -org/jboss/test/ws/jaxws/jbws3041/** org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.* # [JBWS-2987] Review JMS integration Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-08-31 12:32:51 UTC (rev 12880) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-08-31 13:20:26 UTC (rev 12881) @@ -39,12 +39,8 @@ org/jboss/test/ws/jaxrpc/** # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/jbws2960/** -org/jboss/test/ws/jaxws/jbws2991/** -org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/jbws3031/** -org/jboss/test/ws/jaxws/jbws3041/** org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.* # [JBWS-2987] Review JMS integration Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-08-31 12:32:51 UTC (rev 12880) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-08-31 13:20:26 UTC (rev 12881) @@ -32,12 +32,8 @@ # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/jbws2960/** -org/jboss/test/ws/jaxws/jbws2991/** -org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/jbws3031/** -org/jboss/test/ws/jaxws/jbws3041/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12880 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-31 08:32:51 -0400 (Tue, 31 Aug 2010) New Revision: 12880 Removed: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/ Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBWS-3009] removing wrong test - this is JBossAS unsupported scenario Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-31 12:29:22 UTC (rev 12879) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-31 12:32:51 UTC (rev 12880) @@ -943,15 +943,6 @@ </webinf> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3009.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3009/HelloIface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3009/Hello1Impl.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3009/Hello2Impl.class"/> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3022.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3022/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes">

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12879 - stack/cxf/trunk/modules/testsuite/framework-tests/scripts.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-31 08:29:22 -0400 (Tue, 31 Aug 2010) New Revision: 12879 Modified: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml Log: not verbose Modified: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-08-31 11:52:44 UTC (rev 12878) +++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-08-31 12:29:22 UTC (rev 12879) @@ -43,7 +43,7 @@ sei="@{sei}" fork="true" genwsdl="true" - verbose="true" + verbose="false" classpath="@{outputDir}/test-classes" destdir="@{outputDir}/test-classes/@{destDir}" resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12878 - in stack/cxf/trunk/modules/testsuite: framework-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-31 07:52:44 -0400 (Tue, 31 Aug 2010) New Revision: 12878 Added: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2960] enabling test Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-08-31 11:20:43 UTC (rev 12877) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-08-31 11:52:44 UTC (rev 12878) @@ -100,6 +100,7 @@ <property name="project.version" value="${project.version}"/> <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> </tasks> </configuration> @@ -111,7 +112,14 @@ </goals> <configuration> <tasks> + <property name="maven.test.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="project.version" value="${project.version}"/> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"/> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> + <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> Modified: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-08-31 11:20:43 UTC (rev 12877) +++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-08-31 11:52:44 UTC (rev 12878) @@ -7,28 +7,62 @@  <project> - -  -  -  - + <target name="wsconsume" description="Consume JAX-WS contracts"> - -  + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> - - <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false" fork="true"> - <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> - <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> - </wsconsume> - <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false" fork="true"> - <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> - <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> - </wsconsume> + + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" + package="org.jboss.test.ws.jaxws.complex" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" + loggingDir="${log4j.output.dir}" + /> + + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" + package="org.jboss.test.ws.jaxws.holder" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + log4jConf="${log4j.conf}" + loggingDir="${log4j.output.dir}" + /> + </target> - + + <macrodef name="wsconsume-macro"> + + <attribute name="wsdl"/> + <attribute name="package"/> + <attribute name="outputDir"/> + <attribute name="jbossHome"/> + <attribute name="log4jConf"/> + <attribute name="loggingDir"/> + + <sequential> + <wsconsume + wsdl="@{wsdl}" + package="@{package}" + sourcedestdir="@{outputdir}/wsconsume/java" + destdir="@{outputdir}" + nocompile="true" + keep="true" + verbose="false" + target="2.2" + fork="true" + > + <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsconsume> + </sequential> + + </macrodef> + </project> Added: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-08-31 11:52:44 UTC (rev 12878) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + +<project> + + <target name="wsprovide" description="Provide JAX-WS contracts"> + + <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> + <classpath> + <pathelement path="${maven.test.classpath}"/> + </classpath> + </taskdef> + + <wsprovide-macro + sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl" + destdir="jaxws/jbws2960" + jbossHome="${jboss.home}" + outputDir="${tests.output.dir}" + log4jConf="${log4j.conf}" + loggingDir="${log4j.output.dir}" + resourcesDir="jaxws/jbws2960" + /> + + </target> + + <macrodef name="wsprovide-macro"> + + <attribute name="sei"/> + <attribute name="destDir"/> + <attribute name="jbossHome"/> + <attribute name="outputDir"/> + <attribute name="log4jConf"/> + <attribute name="loggingDir"/> + <attribute name="resourcesDir"/> + + <sequential> + <wsprovide + sei="@{sei}" + fork="true" + genwsdl="true" + verbose="true" + classpath="@{outputDir}/test-classes" + destdir="@{outputDir}/test-classes/@{destDir}" + resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" + > + <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsprovide> + </sequential> + + </macrodef> + +</project> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-31 11:20:43 UTC (rev 12877) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-31 11:52:44 UTC (rev 12878) @@ -32,7 +32,6 @@ # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/jbws3031/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*

14 years, 3 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-31 07:20:43 -0400 (Tue, 31 Aug 2010) New Revision: 12877 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: enabling working tests Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-31 10:58:11 UTC (rev 12876) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-31 11:20:43 UTC (rev 12877) @@ -33,11 +33,8 @@ org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/jbws2960/** -org/jboss/test/ws/jaxws/jbws2991/** -org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/jbws3031/** -org/jboss/test/ws/jaxws/jbws3041/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12876 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-31 06:58:11 -0400 (Tue, 31 Aug 2010) New Revision: 12876 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java Log: fix AS trunk regression Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-30 12:32:39 UTC (rev 12875) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-31 10:58:11 UTC (rev 12876) @@ -233,7 +233,7 @@ </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest.sar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest-service.sar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF"> <include name="jboss-service.xml"/> <include name="login-config.xml"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-08-30 12:32:39 UTC (rev 12875) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-08-31 10:58:11 UTC (rev 12876) @@ -47,20 +47,20 @@ public final class UsernameDigestTestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-digest"; - + private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort"); - + public static Test suite() { - return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.sar jaxws-samples-wsse-username-digest.war"); + return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war"); } public void testAuthorized() throws Exception { - doTestAuthorized(serviceURL, servicePort, "kermit"); + doTestAuthorized(serviceURL, servicePort, "kermit"); } - -private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception + + private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); URL wsdlURL = new URL(endpointAddress + "?wsdl"); @@ -90,9 +90,9 @@ public void testUnauthorized() throws Exception { - doTestUnauthorized(serviceURL, servicePort, "kermit"); + doTestUnauthorized(serviceURL, servicePort, "kermit"); } - + private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); @@ -110,7 +110,7 @@ assertEquals("Unauthorized", ex.getMessage()); } } - + private void setupWsse(ServiceIface proxy, String username) { Client client = ClientProxy.getClient(proxy); @@ -125,6 +125,4 @@ cxfEndpoint.getOutInterceptors().add(wssOut); cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor()); } - - }

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12875 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-08-30 08:32:39 -0400 (Mon, 30 Aug 2010) New Revision: 12875 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello1Impl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello2Impl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/HelloIface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/JBWS3009TestCase.java Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBWS-3009] providing test case Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-30 09:26:44 UTC (rev 12874) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-30 12:32:39 UTC (rev 12875) @@ -943,6 +943,15 @@ </webinf> </war> +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3009.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3009/HelloIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3009/Hello1Impl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3009/Hello2Impl.class"/> + </fileset> + </jar> +  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3022.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3022/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello1Impl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello1Impl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello1Impl.java 2010-08-30 12:32:39 UTC (rev 12875) @@ -0,0 +1,41 @@ +/* + * 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.test.ws.jaxws.jbws3009; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws3009.HelloIface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws3009", serviceName = "Service1") +@WebContext(contextRoot = "jbws3009-context1") +public class Hello1Impl implements HelloIface +{ + public String sayHello() + { + return "Hello 1"; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello2Impl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello2Impl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/Hello2Impl.java 2010-08-30 12:32:39 UTC (rev 12875) @@ -0,0 +1,41 @@ +/* + * 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.test.ws.jaxws.jbws3009; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws3009.HelloIface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws3009", serviceName = "Service2") +@WebContext(contextRoot = "jbws3009-context2") +public class Hello2Impl implements HelloIface +{ + public String sayHello() + { + return "Hello 2"; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/HelloIface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/HelloIface.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/HelloIface.java 2010-08-30 12:32:39 UTC (rev 12875) @@ -0,0 +1,35 @@ +/* + * 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.test.ws.jaxws.jbws3009; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws3009") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface HelloIface +{ + String sayHello(); +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/JBWS3009TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/JBWS3009TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3009/JBWS3009TestCase.java 2010-08-30 12:32:39 UTC (rev 12875) @@ -0,0 +1,65 @@ +/* + * 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.test.ws.jaxws.jbws3009; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-3009] EJB3 services in different web contexts. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBWS3009TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS3009TestCase.class, "jaxws-jbws3009.jar"); + } + + public void testEJB1() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3009-context1/Hello1Impl?wsdl"); + QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws3009", "Service1"); + Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName); + HelloIface port = (HelloIface)service.getPort(HelloIface.class); + assertEquals("Hello 1", port.sayHello()); + } + + public void testEJB2() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3009-context2/Hello2Impl?wsdl"); + QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws3009", "Service2"); + Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName); + HelloIface port = (HelloIface)service.getPort(HelloIface.class); + assertEquals("Hello 2", port.sayHello()); + } +}

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12874 - stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-08-30 05:26:44 -0400 (Mon, 30 Aug 2010) New Revision: 12874 Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java Log: [JBWS-3079][JBWS-3103] Automatically generate address if not provided, required for supporting Endpoint.getBinding() without publish Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2010-08-30 09:24:50 UTC (rev 12873) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2010-08-30 09:26:44 UTC (rev 12874) @@ -63,6 +63,7 @@ super(b, ei); this.factory = factory; this.serverEngineFactory = factory.getServerEngineFactory(); + getAddressValue(ei, true); //generate address if not specified this.url = new URL(ei.getAddress()); }

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12873 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-08-30 05:24:50 -0400 (Mon, 30 Aug 2010) New Revision: 12873 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java Log: [JBWS-3103] Adding additional checks for Endpoint API Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2010-08-27 16:39:05 UTC (rev 12872) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2010-08-30 09:24:50 UTC (rev 12873) @@ -86,6 +86,8 @@ String helloWorld = "Hello world!"; Object retObj = port.echo(helloWorld, getServerHost(), 9796); assertEquals(helloWorld, retObj); + retObj = port.echo2(helloWorld); + assertEquals(helloWorld, retObj); } private void readWSDL(URL wsdlURL) throws Exception Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java 2010-08-27 16:39:05 UTC (rev 12872) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java 2010-08-30 09:24:50 UTC (rev 12873) @@ -64,4 +64,14 @@ } } } + + public String echo2(String input) + { + Endpoint ep = Endpoint.create(new EndpointBean()); + if (ep.getBinding() == null || ep.getImplementor() == null) + { + throw new WebServiceException("null binding or implementor!"); + } + return input; + } } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java 2010-08-27 16:39:05 UTC (rev 12872) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java 2010-08-30 09:24:50 UTC (rev 12873) @@ -30,4 +30,6 @@ public interface WSClientEndpointInterface extends Remote { String echo(String input, String serverHost, int port) throws RemoteException; + + String echo2(String input) throws RemoteException; }

14 years, 3 months

1
0
0 / 0

JBossWS SVN: r12872 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/endpoint and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-08-27 12:39:05 -0400 (Fri, 27 Aug 2010) New Revision: 12872 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java Log: [JBWS-3103] Adding further tests Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-27 16:38:33 UTC (rev 12871) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-27 16:39:05 UTC (rev 12872) @@ -1009,6 +1009,16 @@ <include name="wsdl/**" /> </webinf> </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-ws.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web-ws.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.class" /> + <include name="org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.class" /> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class" /> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class" /> + </classes> + </war>  <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2010-08-27 16:38:33 UTC (rev 12871) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2010-08-27 16:39:05 UTC (rev 12872) @@ -48,7 +48,7 @@ public static Test suite() { - return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")); + return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war jaxws-endpoint-ws.war")); } public void testWSDLAccess() throws Exception @@ -76,7 +76,18 @@ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } + + public void testWSAccess() throws Exception + { + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "WSClientEndpointService"); + Service service = Service.create(new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-ws?wsdl"), qname); + WSClientEndpointInterface port = (WSClientEndpointInterface)service.getPort(WSClientEndpointInterface.class); + String helloWorld = "Hello world!"; + Object retObj = port.echo(helloWorld, getServerHost(), 9796); + assertEquals(helloWorld, retObj); + } + private void readWSDL(URL wsdlURL) throws Exception { WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java 2010-08-27 16:39:05 UTC (rev 12872) @@ -0,0 +1,67 @@ +/* + * 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.test.ws.jaxws.endpoint; + +import java.net.URL; + +import javax.jws.WebService; +import javax.xml.namespace.QName; +import javax.xml.ws.Endpoint; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +/** + * An endpoint that publishes and invokes another endpoint using Endpoint.publish(..) API + * + * @author alessio.soldano(a)jboss.com + * @since 26-Aug-2010 + * + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.WSClientEndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "WSClientEndpointService") +public class WSClientEndpointBean implements WSClientEndpointInterface +{ + public String echo(String input, String serverHost, int port) + { + Endpoint ep = Endpoint.create(new EndpointBean()); + String publishUrl = "http://" + serverHost + ":" + port + "/foo/bar"; + ep.publish(publishUrl); + + try + { + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService"); + Service service = Service.create(new URL(publishUrl + "?wsdl"), qname); + EndpointInterface proxy = (EndpointInterface) service.getPort(EndpointInterface.class); + return proxy.echo(input); + } + catch (Exception e) + { + throw new WebServiceException(e); + } + finally + { + if (ep != null) + { + ep.stop(); + } + } + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java 2010-08-27 16:39:05 UTC (rev 12872) @@ -0,0 +1,33 @@ +/* + * 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.test.ws.jaxws.endpoint; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +import javax.jws.WebService; + +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint") +public interface WSClientEndpointInterface extends Remote +{ + String echo(String input, String serverHost, int port) throws RemoteException; +} Added: framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml 2010-08-27 16:39:05 UTC (rev 12872) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>WSClientTestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.endpoint.WSClientEndpointBean</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>WSClientTestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +

14 years, 3 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 August 2010