July 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7792 - in stack/native/trunk: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-07-08 08:22:17 -0400 (Tue, 08 Jul 2008) New Revision: 7792 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/profiles.xml.example Log: AS5-Beta4 -> AS5-CR1 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-08 11:02:42 UTC (rev 7791) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-08 12:22:17 UTC (rev 7792) @@ -13,6 +13,9 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* +# [JBAS-5055] Failed to load users/passwords/role files +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* + # [JBAS-5114] MessageDriven EJB3 does not create destination automatically org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/dar/** @@ -20,9 +23,8 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** +# [JBAS-5257] Cannot deploy through jax-ws endpoint API +org/jboss/test/ws/jaxws/endpoint/** # [JBWS-2217] Fix BPEL samples before AS50 goes final org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2008-07-08 11:02:42 UTC (rev 7791) +++ stack/native/trunk/profiles.xml.example 2008-07-08 12:22:17 UTC (rev 7792) @@ -15,8 +15,8 @@ <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home> <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home> - <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home> </properties> </profile>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7791 - in framework/trunk/hudson: hudson-home/jobs/AS-5.0.0 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-07-08 07:02:42 -0400 (Tue, 08 Jul 2008) New Revision: 7791 Modified: framework/trunk/hudson/ant.properties.example framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml Log: replace AS-5-Beta4 with AS-5-CR1 Modified: framework/trunk/hudson/ant.properties.example =================================================================== --- framework/trunk/hudson/ant.properties.example 2008-07-07 12:35:44 UTC (rev 7790) +++ framework/trunk/hudson/ant.properties.example 2008-07-08 11:02:42 UTC (rev 7791) @@ -38,12 +38,12 @@ hudson.jboss423.build=jboss-4.2.3.GA hudson.jboss423.rev=HEAD -hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4 -hudson.jboss500.build=jboss-5.0.0.Beta4 +hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_CR1 +hudson.jboss500.build=jboss-5.0.0.CR1 hudson.jboss500.rev=HEAD hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk -hudson.jboss501.build=jboss-5.0.0.CR1 +hudson.jboss501.build=jboss-5.0.0.CR2 hudson.jboss501.rev=HEAD hudson.mail.recipients= Modified: framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml 2008-07-07 12:35:44 UTC (rev 7790) +++ framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml 2008-07-08 11:02:42 UTC (rev 7791) @@ -21,7 +21,6 @@ # build jboss # cd $SVNBASE -rm -rf thirdparty/* ./build/build.sh clean main #

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7790 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/tools/wsdl and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-07 08:35:44 -0400 (Mon, 07 Jul 2008) New Revision: 7790 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java Log: [JBPAPP-959] Reference to JAXBElement Causes NullPointerException on deployment. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-07-07 11:55:25 UTC (rev 7789) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-07-07 12:35:44 UTC (rev 7790) @@ -644,6 +644,17 @@ <include name="*.*"/> </fileset> </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws2250.war" webxml="${tests.output.dir}/resources/jaxws/jbws2250/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws2250/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2250/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws2250/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war>  <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2008-07-07 11:55:25 UTC (rev 7789) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -21,7 +21,14 @@ */ package org.jboss.ws.tools.wsdl; -import com.sun.xml.bind.api.JAXBRIContext; +import java.io.IOException; + +import javax.xml.bind.SchemaOutputResolver; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Result; +import javax.xml.transform.dom.DOMResult; + import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.extensions.security.Util; @@ -29,12 +36,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Result; -import javax.xml.transform.dom.DOMResult; -import java.io.IOException; +import com.sun.xml.bind.api.JAXBRIContext; /** * JAXBWSDLGenerator provides a JAXB based WSDLGenerator. @@ -69,8 +71,7 @@ final Element element = types.getElement(); final Element throwAway = doc.createElement("throw-away"); - ctx.generateSchema(new SchemaOutputResolver() - { + ctx.generateSchema(new SchemaOutputResolver() { @Override public Result createOutput(String namespace, String file) throws IOException { @@ -79,8 +80,18 @@ wsdl.registerNamespaceURI(namespace, null); // JAXB creates an empty namespace due to type references, ignore it - DOMResult result = new DOMResult((namespace == null || namespace.length() == 0) ? throwAway : element); - result.setSystemId("replace-me"); + DOMResult result = null; + if (namespace == null || namespace.length() == 0) + { + result = new DOMResult(throwAway); + result.setSystemId("remove-me"); + } + else + { + result = new DOMResult(element); + result.setSystemId("replace-me"); + } + return result; } }); @@ -100,10 +111,16 @@ { for (Element child = Util.getFirstChildElement(element); child != null; child = Util.getNextSiblingElement(child)) { - if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) && "replace-me".equals(child.getAttribute("schemaLocation"))) + if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) + && "replace-me".equals(child.getAttribute("schemaLocation"))) { child.removeAttribute("schemaLocation"); } + else if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) + && "remove-me".equals(child.getAttribute("schemaLocation"))) + { + element.removeChild(child); + } else { removeSchemaLocations(child); Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250 (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2250; - -import javax.jws.WebService; - -/** - * The test service endpoint interface. - * - * @author darran.lofthouse(a)jboss.com - * @since 7th July 2008 - */ -@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2250") -public interface Endpoint -{ - - public Message echo(Message message); - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.jws.WebService; + +/** + * The test service endpoint interface. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2250") +public interface Endpoint +{ + + public Message echo(Message message); + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2250; - -import javax.jws.WebService; - -/** - * The test service endpoint implementation. - * - * @author darran.lofthouse(a)jboss.com - * @since 7th July 2008 - */ -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2250") -public class EndpointImpl implements Endpoint -{ - - public Message echo(Message message) - { - return message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.jws.WebService; + +/** + * The test service endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2250") +public class EndpointImpl implements Endpoint +{ + + public Message echo(Message message) + { + return message; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2250; - -/** - * Test type to be marshalled. - * - * @author darran.lofthouse(a)jboss.com - * @since 7th July 2008 - */ -public class Id -{ - - private String id; - - public String getId() - { - return id; - } - - public void setId(String id) - { - this.id = id; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +/** + * Test type to be marshalled. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +public class Id +{ + + private String id; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2250; - -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-2250] Test Case. - * - * The user of JAXBElement causes a NullPointerException on deployment - * where JBossWS generates a new WSDL. - * - * @author darran.lofthouse(a)jboss.com - * @since 7th July 2008 - */ -public class JBWS2250TestCase extends JBossWSTest -{ - - public static Test suite() - { - return new JBossWSTestSetup(JBWS2250TestCase.class, "jaxws-jbws2250.war"); - } - - public void testPortAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2250?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2250", "EndpointService"); - Service service = Service.create(wsdlURL, serviceName); - Endpoint port = service.getPort(Endpoint.class); - - ObjectFactory of = new ObjectFactory(); - Id id = new Id(); - id.setId("003"); - - Message message = new Message(); - message.setMessage("Hello"); - message.setMyId(of.createLayoutPerformanceId(id)); - - Message retMessage = port.echo(message); - assertEquals(message.getMessage(), retMessage.getMessage()); - assertEquals(id.getId(), retMessage.getMyId().getValue().getId()); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +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-2250] Test Case. + * + * The user of JAXBElement causes a NullPointerException on deployment + * where JBossWS generates a new WSDL. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +public class JBWS2250TestCase extends JBossWSTest +{ + + public static Test suite() + { + return new JBossWSTestSetup(JBWS2250TestCase.class, "jaxws-jbws2250.war"); + } + + public void testPortAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2250?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2250", "EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + ObjectFactory of = new ObjectFactory(); + Id id = new Id(); + id.setId("003"); + + Message message = new Message(); + message.setMessage("Hello"); + message.setMyId(of.createLayoutPerformanceId(id)); + + Message retMessage = port.echo(message); + assertEquals(message.getMessage(), retMessage.getMessage()); + assertEquals(id.getId(), retMessage.getMyId().getValue().getId()); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2250; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; - -/** - * Test type to be marshalled. - * - * @author darran.lofthouse(a)jboss.com - * @since 7th July 2008 - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -public class Message -{ - - @XmlElementRef(name = "myId", type = JAXBElement.class) - protected JAXBElement<Id> myId; - - protected String message; - - public JAXBElement<Id> getMyId() - { - return myId; - } - - public void setMyId(JAXBElement<Id> myId) - { - this.myId = myId; - } - - public String getMessage() - { - return message; - } - - public void setMessage(String message) - { - this.message = message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElementRef; + +/** + * Test type to be marshalled. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +public class Message +{ + + @XmlElementRef(name = "myId", type = JAXBElement.class) + protected JAXBElement<Id> myId; + + protected String message; + + public JAXBElement<Id> getMyId() + { + return myId; + } + + public void setMyId(JAXBElement<Id> myId) + { + this.myId = myId; + } + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2250; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -/** - * The ObjectFactory to instantiate the JAXBElement. - * - * @author darran.lofthouse(a)jboss.com - * @since 7th July 2008 - */ -@XmlRegistry -public class ObjectFactory -{ - - private final static QName _MessageId_QNAME = new QName("", "myId"); - - @XmlElementDecl(namespace = "", name = "myId") - public JAXBElement<Id> createLayoutPerformanceId(Id value) - { - return new JAXBElement<Id>(_MessageId_QNAME, Id.class, value); - } -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java (from rev 7788, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +/** + * The ObjectFactory to instantiate the JAXBElement. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +@XmlRegistry +public class ObjectFactory +{ + + private final static QName _MessageId_QNAME = new QName("", "myId"); + + @XmlElementDecl(namespace = "", name = "myId") + public JAXBElement<Id> createLayoutPerformanceId(Id value) + { + return new JAXBElement<Id>(_MessageId_QNAME, Id.class, value); + } +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250 (from rev 7788, framework/trunk/testsuite/test/resources/jaxws/jbws2250) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF (from rev 7788, framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> -  - <context-root>/jaxws-jbws2250</context-root> -</jboss-web> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml (from rev 7788, framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> +  + <context-root>/jaxws-jbws2250</context-root> +</jboss-web> Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml 2008-07-07 12:35:44 UTC (rev 7790) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" 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"> - - <servlet> - <servlet-name>Endpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2250.EndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Endpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml (from rev 7788, framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2250/WEB-INF/web.xml 2008-07-07 12:35:44 UTC (rev 7790) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2250.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7789 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-07 07:55:25 -0400 (Mon, 07 Jul 2008) New Revision: 7789 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java Log: [JBWS-2250] Reference to JAXBElement Causes NullPointerException on deployment. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2008-07-07 11:55:00 UTC (rev 7788) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2008-07-07 11:55:25 UTC (rev 7789) @@ -21,7 +21,14 @@ */ package org.jboss.ws.tools.wsdl; -import com.sun.xml.bind.api.JAXBRIContext; +import java.io.IOException; + +import javax.xml.bind.SchemaOutputResolver; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Result; +import javax.xml.transform.dom.DOMResult; + import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.extensions.security.Util; @@ -29,12 +36,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Result; -import javax.xml.transform.dom.DOMResult; -import java.io.IOException; +import com.sun.xml.bind.api.JAXBRIContext; /** * JAXBWSDLGenerator provides a JAXB based WSDLGenerator. @@ -69,8 +71,7 @@ final Element element = types.getElement(); final Element throwAway = doc.createElement("throw-away"); - ctx.generateSchema(new SchemaOutputResolver() - { + ctx.generateSchema(new SchemaOutputResolver() { @Override public Result createOutput(String namespace, String file) throws IOException { @@ -79,8 +80,18 @@ wsdl.registerNamespaceURI(namespace, null); // JAXB creates an empty namespace due to type references, ignore it - DOMResult result = new DOMResult((namespace == null || namespace.length() == 0) ? throwAway : element); - result.setSystemId("replace-me"); + DOMResult result = null; + if (namespace == null || namespace.length() == 0) + { + result = new DOMResult(throwAway); + result.setSystemId("remove-me"); + } + else + { + result = new DOMResult(element); + result.setSystemId("replace-me"); + } + return result; } }); @@ -100,10 +111,16 @@ { for (Element child = Util.getFirstChildElement(element); child != null; child = Util.getNextSiblingElement(child)) { - if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) && "replace-me".equals(child.getAttribute("schemaLocation"))) + if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) + && "replace-me".equals(child.getAttribute("schemaLocation"))) { child.removeAttribute("schemaLocation"); } + else if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) + && "remove-me".equals(child.getAttribute("schemaLocation"))) + { + element.removeChild(child); + } else { removeSchemaLocations(child);

15 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-07 07:55:00 -0400 (Mon, 07 Jul 2008) New Revision: 7788 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java framework/trunk/testsuite/test/resources/jaxws/jbws2250/ framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2250] Reference to JAXBElement Causes NullPointerException on deployment. Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-04 15:08:05 UTC (rev 7787) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-07 11:55:00 UTC (rev 7788) @@ -528,6 +528,17 @@ <include name="schema/**"/> </webinf> </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2250/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2250/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war>  <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.jws.WebService; + +/** + * The test service endpoint interface. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2250") +public interface Endpoint +{ + + public Message echo(Message message); + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Endpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.jws.WebService; + +/** + * The test service endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2250") +public class EndpointImpl implements Endpoint +{ + + public Message echo(Message message) + { + return message; + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/EndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +/** + * Test type to be marshalled. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +public class Id +{ + + private String id; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Id.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +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-2250] Test Case. + * + * The user of JAXBElement causes a NullPointerException on deployment + * where JBossWS generates a new WSDL. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +public class JBWS2250TestCase extends JBossWSTest +{ + + public static Test suite() + { + return new JBossWSTestSetup(JBWS2250TestCase.class, "jaxws-jbws2250.war"); + } + + public void testPortAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2250?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2250", "EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + ObjectFactory of = new ObjectFactory(); + Id id = new Id(); + id.setId("003"); + + Message message = new Message(); + message.setMessage("Hello"); + message.setMyId(of.createLayoutPerformanceId(id)); + + Message retMessage = port.echo(message); + assertEquals(message.getMessage(), retMessage.getMessage()); + assertEquals(id.getId(), retMessage.getMyId().getValue().getId()); + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElementRef; + +/** + * Test type to be marshalled. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +public class Message +{ + + @XmlElementRef(name = "myId", type = JAXBElement.class) + protected JAXBElement<Id> myId; + + protected String message; + + public JAXBElement<Id> getMyId() + { + return myId; + } + + public void setMyId(JAXBElement<Id> myId) + { + this.myId = myId; + } + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/Message.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2250; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +/** + * The ObjectFactory to instantiate the JAXBElement. + * + * @author darran.lofthouse(a)jboss.com + * @since 7th July 2008 + */ +@XmlRegistry +public class ObjectFactory +{ + + private final static QName _MessageId_QNAME = new QName("", "myId"); + + @XmlElementDecl(namespace = "", name = "myId") + public JAXBElement<Id> createLayoutPerformanceId(Id value) + { + return new JAXBElement<Id>(_MessageId_QNAME, Id.class, value); + } +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2250/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> +  + <context-root>/jaxws-jbws2250</context-root> +</jboss-web> Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml 2008-07-07 11:55:00 UTC (rev 7788) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2250.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2250/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7787 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-07-04 11:08:05 -0400 (Fri, 04 Jul 2008) New Revision: 7787 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2136] Enabling test Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-04 15:06:09 UTC (rev 7786) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-04 15:08:05 UTC (rev 7787) @@ -57,9 +57,6 @@ org/jboss/test/ws/jaxws/jbws1843/** org/jboss/test/ws/jaxws/jbws2009/** -# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -org/jboss/test/ws/jaxws/namespace/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-04 15:06:09 UTC (rev 7786) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-04 15:08:05 UTC (rev 7787) @@ -54,9 +54,6 @@ org/jboss/test/ws/jaxws/jbws1843/** org/jboss/test/ws/jaxws/jbws2009/** -# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -org/jboss/test/ws/jaxws/namespace/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-04 15:06:09 UTC (rev 7786) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-04 15:08:05 UTC (rev 7787) @@ -51,9 +51,6 @@ org/jboss/test/ws/jaxws/jbws1843/** org/jboss/test/ws/jaxws/jbws2009/** -# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -org/jboss/test/ws/jaxws/namespace/** - # [JBWS-2137] @WebWservice does not work with class isolation org/jboss/test/ws/jaxws/jbws1556/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-04 15:06:09 UTC (rev 7786) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-04 15:08:05 UTC (rev 7787) @@ -51,9 +51,6 @@ org/jboss/test/ws/jaxws/jbws1843/** org/jboss/test/ws/jaxws/jbws2009/** -# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -org/jboss/test/ws/jaxws/namespace/** - # [JBWS-2194] request requires HTTP authentication: Unauthorized org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*

15 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-07-04 11:06:09 -0400 (Fri, 04 Jul 2008) New Revision: 7786 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/CustomHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/handler-chain.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java Log: [JBWS-2136] Message ctx is required to be a SOAPMessageContext only in a SOAPHandler Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-04 14:24:02 UTC (rev 7785) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-04 15:06:09 UTC (rev 7786) @@ -532,8 +532,10 @@  <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/namespace/CustomHandler.class"/> <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> + <include name="org/jboss/test/ws/jaxws/namespace/*.xml"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF"> <include name="jboss-web.xml"/> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/CustomHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/CustomHandler.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/CustomHandler.java 2008-07-04 15:06:09 UTC (rev 7786) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.namespace; + +import java.util.Set; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPException; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.DOMWriter; + +/** + * A simple SOAPHandler checking the exchanged message uses the SEI namespace. + * + * @author alessio.soldano(a)jboss.com + * @since 04-Jul-2008 + */ +public class CustomHandler implements SOAPHandler +{ + private static final Logger log = Logger.getLogger(CustomHandler.class); + + public Set getHeaders() + { + //don't care + return null; + } + + public void close(MessageContext arg0) + { + //nothing to do + } + + public boolean handleFault(MessageContext arg0) + { + throw new UnsupportedOperationException(); + } + + public boolean handleMessage(MessageContext context) + { + log.debug("handleMessage..."); + try + { + SOAPMessageContext msgContext = (SOAPMessageContext)context; + SOAPBody body = msgContext.getMessage().getSOAPBody(); + String bodyStr = DOMWriter.printNode(body, false); + if (bodyStr.indexOf("http://example.org/sei") < 0) + throw new WebServiceException("Invalid body: " + bodyStr); + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + return true; + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/CustomHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2008-07-04 14:24:02 UTC (rev 7785) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2008-07-04 15:06:09 UTC (rev 7786) @@ -21,16 +21,10 @@ */ package org.jboss.test.ws.jaxws.namespace; -import javax.annotation.Resource; +import javax.jws.HandlerChain; import javax.jws.WebService; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPException; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.common.DOMWriter; /** * Test namespace differences at service and portType levels @@ -39,30 +33,15 @@ * @since 29-Apr-2005 */ @WebService(endpointInterface = "org.jboss.test.ws.jaxws.namespace.EndpointInterface", targetNamespace = "http://example.org/impl") +@HandlerChain(file="handler-chain.xml") public class EndpointBean implements EndpointInterface { private static final Logger log = Logger.getLogger(EndpointBean.class); - @Resource - WebServiceContext context; - public String echo(String message) { log.info("echo:" + message); - - try - { - SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); - SOAPBody body = msgContext.getMessage().getSOAPBody(); - String bodyStr = DOMWriter.printNode(body, false); - if (bodyStr.indexOf("http://example.org/sei") < 0) - throw new WebServiceException("Invalid body: " + bodyStr); - } - catch (SOAPException ex) - { - throw new WebServiceException(ex); - } - + //message check performed in the configured handler return message; } } Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/handler-chain.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/handler-chain.xml (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/handler-chain.xml 2008-07-04 15:06:09 UTC (rev 7786) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>CustomHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.namespace.CustomHandler</handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/namespace/handler-chain.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7785 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-07-04 10:24:02 -0400 (Fri, 04 Jul 2008) New Revision: 7785 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2131] Updating excludes Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-04 14:17:10 UTC (rev 7784) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-04 14:24:02 UTC (rev 7785) @@ -36,6 +36,7 @@ org/jboss/test/ws/jaxws/jbws1529/** org/jboss/test/ws/jaxws/jbws1566/** org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** org/jboss/test/ws/jaxws/jbws1762/** org/jboss/test/ws/jaxws/jbws1797/** org/jboss/test/ws/jaxws/jbws1799/** @@ -48,9 +49,8 @@ org/jboss/test/ws/jaxws/jbws860/** org/jboss/test/ws/jaxws/webfault/** -# [JBWS-2131] WebServiceException: Failed to build METRO runtime model +# [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-04 14:17:10 UTC (rev 7784) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-04 14:24:02 UTC (rev 7785) @@ -33,6 +33,7 @@ org/jboss/test/ws/jaxws/jbws1529/** org/jboss/test/ws/jaxws/jbws1566/** org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** org/jboss/test/ws/jaxws/jbws1762/** org/jboss/test/ws/jaxws/jbws1797/** org/jboss/test/ws/jaxws/jbws1799/** @@ -45,9 +46,8 @@ org/jboss/test/ws/jaxws/jbws860/** org/jboss/test/ws/jaxws/webfault/** -# [JBWS-2131] WebServiceException: Failed to build METRO runtime model +# [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-04 14:17:10 UTC (rev 7784) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-04 14:24:02 UTC (rev 7785) @@ -30,6 +30,7 @@ org/jboss/test/ws/jaxws/jbws1529/** org/jboss/test/ws/jaxws/jbws1566/** org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** org/jboss/test/ws/jaxws/jbws1762/** org/jboss/test/ws/jaxws/jbws1797/** org/jboss/test/ws/jaxws/jbws1799/** @@ -42,9 +43,8 @@ org/jboss/test/ws/jaxws/jbws860/** org/jboss/test/ws/jaxws/webfault/** -# [JBWS-2131] WebServiceException: Failed to build METRO runtime model +# [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-04 14:17:10 UTC (rev 7784) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-04 14:24:02 UTC (rev 7785) @@ -30,6 +30,7 @@ org/jboss/test/ws/jaxws/jbws1529/** org/jboss/test/ws/jaxws/jbws1566/** org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** org/jboss/test/ws/jaxws/jbws1762/** org/jboss/test/ws/jaxws/jbws1797/** org/jboss/test/ws/jaxws/jbws1799/** @@ -42,9 +43,8 @@ org/jboss/test/ws/jaxws/jbws860/** org/jboss/test/ws/jaxws/webfault/** -# [JBWS-2131] WebServiceException: Failed to build METRO runtime model +# [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/**

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7784 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-07-04 10:17:10 -0400 (Fri, 04 Jul 2008) New Revision: 7784 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2249] Updating excludes Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-03 17:13:21 UTC (rev 7783) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-04 14:17:10 UTC (rev 7784) @@ -51,7 +51,6 @@ # [JBWS-2131] WebServiceException: Failed to build METRO runtime model org/jboss/test/ws/jaxws/jbws1702/** org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1807/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** @@ -63,3 +62,6 @@ # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2249] NPE while creating endpoint +org/jboss/test/ws/jaxws/jbws1807/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-03 17:13:21 UTC (rev 7783) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-04 14:17:10 UTC (rev 7784) @@ -48,7 +48,6 @@ # [JBWS-2131] WebServiceException: Failed to build METRO runtime model org/jboss/test/ws/jaxws/jbws1702/** org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1807/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** @@ -60,3 +59,6 @@ # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2249] NPE while creating endpoint +org/jboss/test/ws/jaxws/jbws1807/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-03 17:13:21 UTC (rev 7783) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-04 14:17:10 UTC (rev 7784) @@ -45,7 +45,6 @@ # [JBWS-2131] WebServiceException: Failed to build METRO runtime model org/jboss/test/ws/jaxws/jbws1702/** org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1807/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** @@ -60,3 +59,6 @@ # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2249] NPE while creating endpoint +org/jboss/test/ws/jaxws/jbws1807/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-03 17:13:21 UTC (rev 7783) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-04 14:17:10 UTC (rev 7784) @@ -45,7 +45,6 @@ # [JBWS-2131] WebServiceException: Failed to build METRO runtime model org/jboss/test/ws/jaxws/jbws1702/** org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1807/** # [JBWS-2132] IllegalArgumentException: protocol = http host = null org/jboss/test/ws/jaxws/jbws1798/** @@ -60,3 +59,6 @@ # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2249] NPE while creating endpoint +org/jboss/test/ws/jaxws/jbws1807/**

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r7783 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-07-03 13:13:21 -0400 (Thu, 03 Jul 2008) New Revision: 7783 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2165] Enabling tests Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-03 17:12:50 UTC (rev 7782) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-03 17:13:21 UTC (rev 7783) @@ -61,8 +61,5 @@ # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl org/jboss/test/ws/jaxws/namespace/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-03 17:12:50 UTC (rev 7782) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-03 17:13:21 UTC (rev 7783) @@ -58,8 +58,5 @@ # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl org/jboss/test/ws/jaxws/namespace/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-03 17:12:50 UTC (rev 7782) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-03 17:13:21 UTC (rev 7783) @@ -58,8 +58,5 @@ # [JBWS-2137] @WebWservice does not work with class isolation org/jboss/test/ws/jaxws/jbws1556/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-03 17:12:50 UTC (rev 7782) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-03 17:13:21 UTC (rev 7783) @@ -55,9 +55,6 @@ # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl org/jboss/test/ws/jaxws/namespace/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2194] request requires HTTP authentication: Unauthorized org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*

15 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 July 2008