Author: ropalka Date: 2012-03-29 08:02:55 -0400 (Thu, 29 Mar 2012) New Revision: 16066 Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/wsf.png Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-3474] resuscitating generic tests removed from native Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-03-29 09:49:45 UTC (rev 16065) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -411,6 +411,15 @@ </webinf> </war> + <!-- jaxws-jbws1809 --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1809/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class" /> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> + </jar> + <!-- jaxws-jbws1813 --> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF/MANIFEST.MF"> <fileset dir="${tests.output.dir}/test-classes"> @@ -707,6 +716,22 @@ </metainf> </jar> + <!-- jaxws-jbws2259 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2259/Endpoint.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2259/CustomHandler.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2259/Photo.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF"> + <include name="jaxws-endpoint-config.xml" /> + </webinf> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> + </war> + <!-- jaxws-jbws2268 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -949,6 +974,19 @@ </fileset> </jar> + <!-- jaxws-jbws2978 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> + <include name="jboss-web.xml" /> + </webinf> + </war> + <!-- jaxws-jbws2999 --> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2999.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -1066,6 +1104,14 @@ </webinf> </war> + <!-- jaxws-jbws3250 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" /> + </classes> + </war> + <!-- jaxws-jbws3282 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3282.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1809; + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class DocRequest +{ + String value; + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1809; + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class DocResponse +{ + String value; + + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1809; + +import javax.ejb.Remote; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + */ +@Remote +@WebService(targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface Endpoint +{ + DocResponse processDocument(DocRequest req); +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1809; + +import javax.ejb.Stateless; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + */ +@Stateless +@WebService( + targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.jbws1809.Endpoint" +) +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public class EndpointImpl implements Endpoint +{ + public DocResponse processDocument(DocRequest req) + { + DocResponse res = new DocResponse(); + res.setValue(req.getValue()+"Response"); + return res; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1809; + +import junit.framework.Test; + +import org.jboss.ws.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import java.net.URL; +import java.util.Iterator; + +/** + * Test the JAXBIntroduction features. + * + * Check if the WSDL is generated correctly. + * The introduction should turn a property into a xsd:attribute declaration. + * + * @author heiko.braun(a)jboss.com + */ +public class JBWS1809TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1809TestCase.class, "jaxws-jbws1809.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1809/EndpointImpl?wsdl"); + + Document doc = DOMUtils.getDocumentBuilder().parse(wsdlURL.toString()); + Element types = (Element)((Element)doc.getDocumentElement() + .getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0)) + .getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "schema").item(0); + Iterator it = DOMUtils.getChildElements(types, "complexType"); + + boolean foundAttributeDeclaration = false; + while(it.hasNext()) + { + Element next = (Element)it.next(); + if(DOMUtils.getAttributeValue(next, "name").equals("docRequest")) + { + Iterator it2 = DOMUtils.getChildElements(next, "attribute"); + + while(it2.hasNext()) + { + Element next2 = (Element)it2.next(); + if(DOMUtils.getAttributeValue(next2, "name").equals("value")) + { + foundAttributeDeclaration = true; + } + } + } + } + + assertTrue("JAXBIntros should turn the 'docRequest.name' property into a XML attribute", foundAttributeDeclaration); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws2259; + +import java.io.ByteArrayOutputStream; + +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.handler.GenericSOAPHandler; + +/** + * Test handker to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +public class CustomHandler extends GenericSOAPHandler +{ + private static final Logger log = Logger.getLogger(CustomHandler.class); + + public boolean handleMessage(final MessageContext msgContext) + { + + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + soapMessage.writeTo(baos); + log.info("Wrote message."); + } + catch (Exception e) + { + throw new WebServiceException("Unable to write message.", e); + } + + return true; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws2259; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +/** + * Test Endpoint to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2259") +@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public interface Endpoint +{ + + public Photo echo(final Photo photo); + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws2259; + +import java.io.IOException; +import java.io.InputStream; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; +import javax.xml.ws.WebServiceException; +import javax.activation.DataHandler; + +import org.jboss.logging.Logger; + +/** + * Test Endpoint to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2259", endpointInterface = "org.jboss.test.ws.jaxws.jbws2259.Endpoint") +@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public class EndpointImpl implements Endpoint +{ + + private static final Logger log = Logger.getLogger(EndpointImpl.class); + + public Photo echo(Photo photo) + { + + DataHandler dh = photo.getImage(); + String contentType = dh.getContentType(); + log.info("Actual content-type " + contentType); + String expectedContentType = photo.getExpectedContentType(); + log.info("Expected content-type " + expectedContentType); + + if (expectedContentType.equals(contentType) == false) + { + throw new WebServiceException("Expected content-type '" + expectedContentType + "' Actual content-type '" + contentType + "'"); + } + + try + { + Object content = dh.getContent(); + log.info("Content - " + content.toString()); + if (content instanceof InputStream == false) + { + throw new WebServiceException("Unexpected content '" + content.getClass().getName() + "'"); + } + } + catch (IOException e) + { + throw new WebServiceException("Unable to getContent()", e); + } + + return photo; + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,85 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2009, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws2259; + +import java.io.File; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 30th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +public class JBWS2259TestCase extends JBossWSTest +{ + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); + } + + public void testCall() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2259";, "EndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); + soapBinding.setMTOMEnabled(true); + + File sharkFile = getResourceFile("jaxws/jbws2259/attach.jpeg"); + DataSource ds = new FileDataSource(sharkFile); + DataHandler handler = new DataHandler(ds); + + String expectedContentType = "image/jpeg"; + + Photo p = new Photo(); + p.setCaption("JBWS2259 Smile :-)"); + p.setExpectedContentType(expectedContentType); + p.setImage(handler); + + Photo reponse = port.echo(p); + DataHandler dhResponse = reponse.getImage(); + + String contentType = dhResponse.getContentType(); + assertEquals("content-type", expectedContentType, contentType); + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws2259; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +/** + * Representation of a photo to test marshalling. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + */ +public class Photo +{ + + private String caption; + + private String expectedContentType; + + private DataHandler image; + + public String getCaption() + { + return caption; + } + + public void setCaption(String caption) + { + this.caption = caption; + } + + public String getExpectedContentType() + { + return expectedContentType; + } + + public void setExpectedContentType(String expectedContentType) + { + this.expectedContentType = expectedContentType; + } + + @XmlMimeType("*/*") + public DataHandler getImage() + { + return image; + } + + public void setImage(DataHandler image) + { + this.image = image; + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -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.jbws2978; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.WebResult; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +@WebService(name = "AddNumbers", targetNamespace = "http://ws.jboss.org") +public interface AddNumbers { + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "addNumbersRequest", targetNamespace = "http://ws.jboss.org", className = "org.jboss.test.ws.jaxws.jbws2978.AddNumbersRequest") + @ResponseWrapper(localName = "addNumbersResponse", targetNamespace = "http://ws.jboss.org", className = "org.jboss.test.ws.jaxws.jbws2978.AddNumbersResponse") + public int addNumbersFault1( + @WebParam(name = "arg0", targetNamespace = "") + int arg0, + @WebParam(name = "arg1", targetNamespace = "") + int arg1); +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,37 @@ +/* + * 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.jbws2978; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.xml.ws.Action; +import javax.xml.ws.soap.Addressing; +@WebService(name = "AddNumbers", portName = "AddNumbersPort", serviceName = "AddNumbers", targetNamespace = "http://ws.jboss.org") +@Addressing(enabled = true, required = true) +public class AddNumbersImpl +{ + + @Action(input = "inputAction", output = "outputAction") + public int addNumbers2(@WebParam(name = "number1") int number1, @WebParam(name = "number2") int number2) + { + return number1 + number2; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,70 @@ +/* + * 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.jbws2978; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addNumbersRequest", propOrder = { + "arg0", + "arg1" +}) +public class AddNumbersRequest { + + protected int arg0; + protected int arg1; + + /** + * Gets the value of the arg0 property. + * + */ + public int getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + */ + public void setArg0(int value) { + this.arg0 = value; + } + + /** + * Gets the value of the arg1 property. + * + */ + public int getArg1() { + return arg1; + } + + /** + * Sets the value of the arg1 property. + * + */ + public void setArg1(int value) { + this.arg1 = value; + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,54 @@ +/* + * 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.jbws2978; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addNumbersResponse", propOrder = { + "_return" +}) +public class AddNumbersResponse { + + @XmlElement(name = "return") + protected int _return; + + /** + * Gets the value of the return property. + * + */ + public int getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + */ + public void setReturn(int value) { + this._return = value; + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,91 @@ +/* + * 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.jbws2978; + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPFaultException; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * JBWS2978TestCase. + * + * @author <a href=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> + */ +public class JBWS2978TestCase extends JBossWSTest +{ + + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2978"; + + private final String requestMessage = "<S:Envelope xmlns:S='http://schemas.xmlsoap.org/soap/envelope/'><S:Head... xmlns='http://www.w3.org/2005/08/addressing'>" + + TARGET_ENDPOINT_ADDRESS + + "</To><Action xmlns='http://www.w3.org/2005/08/addressing'>inputAction</A... + + "<MessageID xmlns='http://www.w3.org/2005/08/addressing'>uuid:56d586f8-980... + + "<ReplyTo xmlns='http://www.w3.org/2005/08/addressing'><Address>ht... + + "</S:Header><S:Body><ns1:addNumbers xmlns:ns1='http://ws.jboss.org'><arg0>10</arg0><arg1>10</arg1></ns1:addNumbers></S:Body></S:Envelope>"; + + public Service service = null; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2978TestCase.class, "jaxws-jbws2978.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org", "AddNumbers"); + service = Service.create(wsdlURL, serviceName); + } + + public void testCall() throws Exception + { + try + { + Dispatch dispatch = service.createDispatch(new QName("http://ws.jboss.org", "AddNumbersPort"), SOAPMessage.class , + Service.Mode.MESSAGE); + SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, + new ByteArrayInputStream(requestMessage.getBytes())); + BindingProvider bp = (BindingProvider)dispatch; + java.util.Map<String, Object> requestContext = bp.getRequestContext(); + requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, "mismatchAction"); + dispatch.invoke(reqMsg); + fail("Should throw SOAPFaultExceptoin"); + } + catch (SOAPFaultException e) + { + assertEquals(true, e.getFault().getFaultCode().indexOf("ActionMismatch") > -1); + } + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,57 @@ +/* + * 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.jbws3124; + +import java.io.StringReader; + +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.EndpointReference; + +import org.jboss.ws.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-2942] Do not add empty Metadata tag to EndpointReference. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBWS3124TestCase extends JBossWSTest +{ + private final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + + "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + + " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + + " <Metadata/>\n" + + "</EndpointReference>\n"; + + public void testToString() throws Exception + { + assertTrue("Lost empty <Metadata/>", this.getXML(XML_SOURCE).indexOf("<Metadata") != -1); + StreamSource source = new StreamSource(new StringReader(XML_SOURCE)); + EndpointReference epRef = EndpointReference.readFrom(source); + assertTrue("Empty <Metadata/> serialized", epRef.toString().indexOf("<Metadata") == -1); + } + + private String getXML(final String s) throws Exception + { + return DOMUtils.node2String(DOMUtils.parse(s)); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.jws.WebService; + +@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250") +public interface Endpoint +{ + public MTOMResponse echo(MTOMRequest message); + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; + + +@WebService( + name = "TestEndpoint", + targetNamespace = "http://ws.jboss.org/jbws3250", + serviceName = "TestEndpointService", + endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC, + use = SOAPBinding.Use.LITERAL) +@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") + +public class EndpointImpl implements Endpoint +{ + public MTOMResponse echo(MTOMRequest message) { + MTOMResponse response = new MTOMResponse(); + response.setContent(message.getContent()); + response.setResponse("Response for requestID:" + message.getId()); + return response; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import java.net.URL; + +import javax.activation.DataHandler; +import javax.activation.URLDataSource; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Assert; +import junit.framework.Test; + +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class JBWS3250TestCase extends JBossWSTest +{ + private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250"; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war"); + } + + public void testMtomSawpFile() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws3250";, "TestEndpointService"); + Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); + SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + URL url = JBossWSTestHelper.getResourceURL("jaxws/jbws3250/wsf.png"); + URLDataSource urlDatasource = new URLDataSource(url); + javax.activation.DataHandler dh = new DataHandler(urlDatasource); + MTOMRequest request = new MTOMRequest(); + request.setContent(dh); + request.setId("largeSize_mtom_request"); + MTOMResponse mtomResponse = port.echo(request); + Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse()); + byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent()); + Assert.assertTrue(responseBytes.length > 65536); + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +public class MTOMRequest +{ + private DataHandler content; + + private String id; + + @XmlMimeType("*/*") + public DataHandler getContent() + { + return content; + } + + public void setContent(DataHandler content) + { + this.content = content; + } + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +public class MTOMResponse +{ + private DataHandler content; + + private String response; + + @XmlMimeType("*/*") + public DataHandler getContent() + { + return content; + } + + public void setContent(DataHandler content) + { + this.content = content; + } + + public String getResponse() + { + return response; + } + + public void setResponse(String res) + { + this.response = res; + } +} Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,26 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" default-namespace="http://org.jboss.ws/jaxbintro/wsdl"> + + <!-- + The XSD for the schema can be found at: + http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/extras/jaxbintr... + Register it against the http://www.jboss.org/xsd/jaxb/intros namespace in your IDE and away you go :-) + --> + + <!-- + Note: how the "name" attributes on class, field and method configs can be regular expressions. + --> + + <!-- + The type namespaces on the customerOrder are different from the rest of the message... + --> + <Class name="org.jboss.test.ws.jaxws.jbws1809.DocRequest"> + <XmlAccessorType value="FIELD"/> + <XmlRootElement name="request" namespace="http://org.jboss.ws/jaxbintro/wsdl"/> + + <Field name="value"> + <XmlAttribute /> + </Field> + </Class> + +</jaxb-intros> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Custom Server Config</config-name> + + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name> CustomHandler </javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2259.CustomHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,20 @@ +<?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>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2259.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + +</web-app> + Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg =================================================================== (Binary files differ) Property changes on: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,7 @@ +<?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-jbws2978</context-root> +</jboss-web> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,16 @@ +<?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.jbws2978.AddNumbersImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2012-03-29 12:02:55 UTC (rev 16066) @@ -0,0 +1,16 @@ +<?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>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3250.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/wsf.png =================================================================== (Binary files differ) Property changes on: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/wsf.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream