May 2010 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-12 06:38:37 -0400 (Wed, 12 May 2010) New Revision: 12211 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/ClientSOAPHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/JBWS3022TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/AbstractSOAPHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/TestConstants.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbers.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException_Exception.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3_handler.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4_handler.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersResponse.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3_handler.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4_handler.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/ObjectFactory.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/package-info.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersException.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/ServerSOAPHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/server-handler.xml framework/trunk/testsuite/test/resources/jaxws/jbws3022/ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService3.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService4.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile3.xml framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile4.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/WsaSOAPUtils.java Log: [JBWS-3022] providing test case Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-12 07:15:27 UTC (rev 12210) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -947,6 +947,20 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3022.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3022/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3022/service/*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3022/service/*.xml" /> + <include name="org/jboss/test/ws/jaxws/jbws3022/common/*.class"/> + <include name="org/jboss/test/ws/jaxws/common/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3022/WEB-INF"> + <include name="wsdl/**" /> + <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"> <classes dir="${tests.output.dir}/test-classes"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/WsaSOAPUtils.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/WsaSOAPUtils.java 2010-05-12 07:15:27 UTC (rev 12210) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/WsaSOAPUtils.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -272,10 +272,7 @@ Detail d = sf.getDetail(); if (d != null) { - //if(d instanceof Element) - //XMLUtils.XmlDumpDOMNodes((Element)d, false); Iterator iter = d.getDetailEntries(); - Object obj; while (iter.hasNext()) { DetailEntry de = (DetailEntry) iter.next(); @@ -294,7 +291,6 @@ public static String[] getFaultDetail(SOAPMessage message) throws SOAPException { SOAPElement se = null; - SOAPElement se2 = null; Object obj = null; String faultDetail[] = new String[10]; Text text = null; Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/ClientSOAPHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/ClientSOAPHandler.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/ClientSOAPHandler.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,75 @@ +/* + * 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.jbws3022; + +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.test.ws.jaxws.common.Handler_Util; +import org.jboss.test.ws.jaxws.common.W3CAddressingConstants; +import org.jboss.test.ws.jaxws.jbws3022.common.AbstractSOAPHandler; +import org.jboss.test.ws.jaxws.jbws3022.common.TestConstants; + +public final class ClientSOAPHandler extends AbstractSOAPHandler +{ + protected String whichHandler() + { + return "ClientSOAPHandler"; + } + + protected void checkInboundAction(final SOAPMessageContext context, final String oper, final String action) + { + if (Handler_Util.checkForMsg(context, "testAnonymousResponsesAssertion")) + { + assertAnonymousResponsesAddressingHeaders(context, action); + } + else if (Handler_Util.checkForMsg(context, "testNonAnonymousResponsesAssertion")) + { + assertNonAnonymousResponsesAddressingHeaders(context, action); + } + } + + private void assertAnonymousResponsesAddressingHeaders(final SOAPMessageContext messageCtx, final String action) + { + super.assertActionHeaderValue(TestConstants.TEST_ANONYMOUS_RESPONSES_ASSERTION_OUT_ACTION, action); + + final String messageID = super.getHeaderValue(W3CAddressingConstants.WSA_MESSAGEID_QNAME, messageCtx); + assert messageID != null; + + final String relatesTo = super.getHeaderValue(W3CAddressingConstants.WSA_RELATESTO_QNAME, messageCtx); + assert relatesTo != null; + + super.assertAnonymousAddressURI(W3CAddressingConstants.WSA_TO_QNAME, messageCtx); + } + + private void assertNonAnonymousResponsesAddressingHeaders(final SOAPMessageContext messageCtx, final String action) + { + super.assertActionHeaderValue(TestConstants.TEST_NONANONYMOUS_RESPONSES_ASSERTION_OUT_ACTION, action); + + final String messageID = super.getHeaderValue(W3CAddressingConstants.WSA_MESSAGEID_QNAME, messageCtx); + assert messageID != null; + + final String relatesTo = super.getHeaderValue(W3CAddressingConstants.WSA_RELATESTO_QNAME, messageCtx); + assert relatesTo != null; + + super.assertNonAnonymousAddressURI(W3CAddressingConstants.WSA_TO_QNAME, messageCtx); + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/JBWS3022TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/JBWS3022TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/JBWS3022TestCase.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,324 @@ +/* + * 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.jbws3022; + +import java.net.URL; +import java.text.MessageFormat; +import java.util.UUID; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.soap.AddressingFeature; +import javax.xml.ws.soap.SOAPFaultException; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.common.JAXWS_Util; +import org.jboss.test.ws.jaxws.common.W3CAddressingConstants; +import org.jboss.test.ws.jaxws.common.WsaSOAPUtils; +import org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersPortType3; +import org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersPortType4; +import org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersService3; +import org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersService4; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-3022] Respect @Addressing.responses attribute test. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBWS3022TestCase extends JBossWSTest +{ + + private static final String NAMESPACEURI = "http://example.com/"; + + private static final String ANONYMOUS_PORT_NAME = "AddNumbersPort3"; + + private static final String NON_ANONYMOUS_PORT_NAME = "AddNumbersPort4"; + + private static QName ANONYMOUS_PORT_QNAME = new QName(NAMESPACEURI, ANONYMOUS_PORT_NAME); + + private static QName NON_ANONYMOUS_PORT_QNAME = new QName(NAMESPACEURI, NON_ANONYMOUS_PORT_NAME); + + private static AddressingFeature DISABLED_ADDRESSING_FEATURE = new AddressingFeature(false); + + private String anonymousURL = null; + + private String nonAnonymousURL = null; + + private URL anonymousWSDL = null; + + private URL nonAnonymousWSDL = null; + + AddNumbersPortType3 anonymousPort = null; + + AddNumbersPortType4 nonAnonymousPort = null; + + static AddNumbersService3 anonymousService = null; + + static AddNumbersService4 nonAnonymousService = null; + + String replyToHeaderForAnonymousResponsesSoapMsg = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Header><To xmlns=\"http://www.w3.org/2005/08/addressing\">{0}</To><MessageID xmlns=\"http://www.w3.org/2005/08/addressing\">uuid:{1}</MessageID><ReplyTo xmlns=\"http://www.w3.org/2005/08/addressing\"><Address>{2}</Address></ReplyTo><Action xmlns=\"http://www.w3.org/2005/08/addressing\">http://example.com/AddNumbersPortType3/add</Action></S:Header><S:Body><addNumbers xmlns=\"http://example.com/\"><number1>10</number1><number2>10</number2><testName>testAnonymousResponsesReplyToHeader</testName></addNumbers></S:Body></S:Envelope>"; + + String faultToHeaderForAnonymousResponsesSoapMsg = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Header><To xmlns=\"http://www.w3.org/2005/08/addressing\">{0}</To><MessageID xmlns=\"http://www.w3.org/2005/08/addressing\">uuid:{1}</MessageID><FaultTo xmlns=\"http://www.w3.org/2005/08/addressing\"><Address>{2}</Address></FaultTo><ReplyTo xmlns=\"http://www.w3.org/2005/08/addressing\"><Address>{3}</Address></ReplyTo><Action xmlns=\"http://www.w3.org/2005/08/addressing\">http://example.com/AddNumbersPortType3/add</Action></S:Header><S:Body><addNumbers xmlns=\"http://example.com/\"><number1>-10</number1><number2>-10</number2><testName>testAnonymousResponsesFaultToHeader</testName></addNumbers></S:Body></S:Envelope>"; + + String replyToHeaderForNonAnonymousResponsesSoapMsg = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Header><To xmlns=\"http://www.w3.org/2005/08/addressing\">{0}</To><MessageID xmlns=\"http://www.w3.org/2005/08/addressing\">uuid:{1}</MessageID><ReplyTo xmlns=\"http://www.w3.org/2005/08/addressing\"><Address>{2}</Address></ReplyTo><Action xmlns=\"http://www.w3.org/2005/08/addressing\">http://example.com/AddNumbersPortType4/add</Action></S:Header><S:Body><addNumbers xmlns=\"http://example.com/\"><number1>10</number1><number2>10</number2><testName>testNonAnonymousResponsesReplyToHeader</testName></addNumbers></S:Body></S:Envelope>"; + + String faultToHeaderForNonAnonymousResponsesSoapMsg = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Header><To xmlns=\"http://www.w3.org/2005/08/addressing\">{0}</To><MessageID xmlns=\"http://www.w3.org/2005/08/addressing\">uuid:{1}</MessageID><FaultTo xmlns=\"http://www.w3.org/2005/08/addressing\"><Address>{2}</Address></FaultTo><ReplyTo xmlns=\"http://www.w3.org/2005/08/addressing\"><Address>{3}</Address></ReplyTo><Action xmlns=\"http://www.w3.org/2005/08/addressing\">http://example.com/AddNumbersPortType4/add</Action></S:Header><S:Body><addNumbers xmlns=\"http://example.com/\"><number1>-10</number1><number2>-10</number2><testName>testNonAnonymousResponsesFaultToHeader</testName></addNumbers></S:Body></S:Envelope>"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS3022TestCase.class, "jaxws-jbws3022.war"); + } + + protected void setUp() throws Exception + { + anonymousURL = "http://" + getServerHost() + ":8080/jaxws-jbws3022/jaxws/AddNumbers3"; + anonymousWSDL = new URL(anonymousURL + "?wsdl"); + anonymousService = new AddNumbersService3(anonymousWSDL); + nonAnonymousURL = "http://" + getServerHost() + ":8080/jaxws-jbws3022/jaxws/AddNumbers4"; + nonAnonymousWSDL = new URL(nonAnonymousURL + "?wsdl"); + nonAnonymousService = new AddNumbersService4(nonAnonymousWSDL); + anonymousPort = (AddNumbersPortType3) anonymousService.getPort(ANONYMOUS_PORT_QNAME, AddNumbersPortType3.class); + nonAnonymousPort = (AddNumbersPortType4) nonAnonymousService.getPort(NON_ANONYMOUS_PORT_QNAME, + AddNumbersPortType4.class); + } + + private Dispatch<SOAPMessage> createDispatchSOAPMessage(Service service, QName port) throws Exception + { + return service.createDispatch(port, SOAPMessage.class, javax.xml.ws.Service.Mode.MESSAGE, + DISABLED_ADDRESSING_FEATURE); + } + + public void testAnonymousResponsesAssertion() throws Exception + { + anonymousPort.addNumbers(10, 10, "testAnonymousResponsesAssertion"); + } + + public void testNonAnonymousResponsesAssertion() throws Exception + { + try + { + nonAnonymousPort.addNumbers(10, 10, "testNonAnonymousResponsesAssertion"); + fail(); + } + catch (SOAPFaultException e) + { + log.debug("Caught SOAPFaultException ignore: " + e.getMessage()); + } + catch (WebServiceException e) + { + log.debug("Caught WebServiceException ignore: " + e.getMessage()); + } + } + + public void testAnonymousResponsesWithReplyToSetToNone() throws Exception + { + try + { + String soapMsg = MessageFormat.format(replyToHeaderForAnonymousResponsesSoapMsg, anonymousURL, UUID + .randomUUID(), W3CAddressingConstants.WSA_NONE_ADDRESS); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(anonymousService, ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + log.debug("Caught SOAPFaultException ignore: " + e.getMessage()); + } + catch (WebServiceException e) + { + log.debug("Caught WebServiceException ignore: " + e.getMessage()); + } + } + + public void testAnonymousResponsesWithFaultToSetToNone() throws Exception + { + try + { + String soapMsg = MessageFormat.format(faultToHeaderForAnonymousResponsesSoapMsg, anonymousURL, UUID + .randomUUID(), W3CAddressingConstants.WSA_NONE_ADDRESS, W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(anonymousService, ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + log.debug("Caught SOAPFaultException ignore: " + e.getMessage()); + } + catch (WebServiceException e) + { + log.debug("Caught WebServiceException ignore: " + e.getMessage()); + } + } + + public void testNonAnonymousResponsesWithReplyToSetToNone() throws Exception + { + try + { + String soapMsg = MessageFormat.format(replyToHeaderForNonAnonymousResponsesSoapMsg, nonAnonymousURL, UUID + .randomUUID(), W3CAddressingConstants.WSA_NONE_ADDRESS); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(nonAnonymousService, NON_ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + log.debug("Caught SOAPFaultException ignore: " + e.getMessage()); + } + catch (WebServiceException e) + { + log.debug("Caught WebServiceException ignore: " + e.getMessage()); + } + } + + public void testNonAnonymousResponsesWithFaultToSetToNone() throws Exception + { + try + { + String soapMsg = MessageFormat.format(faultToHeaderForNonAnonymousResponsesSoapMsg, nonAnonymousURL, UUID + .randomUUID(), W3CAddressingConstants.WSA_NONE_ADDRESS, W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(nonAnonymousService, NON_ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + log.debug("Caught SOAPFaultException ignore: " + e.getMessage()); + } + catch (WebServiceException e) + { + log.debug("Caught WebServiceException ignore: " + e.getMessage()); + } + } + + public void testOnlyAnonymousAddressSupportedFaultBadReplyTo() throws Exception + { + try + { + String soapMsg = MessageFormat.format(replyToHeaderForAnonymousResponsesSoapMsg, anonymousURL, UUID + .randomUUID(), anonymousURL + "/badurl"); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(anonymousService, ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + assertFaultCode(e, true); + assertProblemHeaderQName(e); + } + } + + public void testOnlyAnonymousAddressSupportedFaultBadFaultTo() throws Exception + { + try + { + String soapMsg = MessageFormat.format(faultToHeaderForAnonymousResponsesSoapMsg, anonymousURL, UUID + .randomUUID(), anonymousURL + "/badurl", W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(anonymousService, ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + assertFaultCode(e, true); + assertProblemHeaderQName(e); + } + } + + public void testOnlyNonAnonymousAddressSupportedFaultBadReplyTo() throws Exception + { + try + { + String soapMsg = MessageFormat.format(replyToHeaderForNonAnonymousResponsesSoapMsg, nonAnonymousURL, UUID + .randomUUID(), W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(nonAnonymousService, NON_ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + assertFaultCode(e, false); + assertProblemHeaderQName(e); + } + } + + public void testOnlyNonAnonymousAddressSupportedFaultBadFaultTo() throws Exception + { + try + { + String soapMsg = MessageFormat.format(faultToHeaderForNonAnonymousResponsesSoapMsg, nonAnonymousURL, UUID + .randomUUID(), W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS, anonymousURL + "/badurl"); + Dispatch<SOAPMessage> dispatchSM = createDispatchSOAPMessage(nonAnonymousService, NON_ANONYMOUS_PORT_QNAME); + SOAPMessage request = JAXWS_Util.makeSOAPMessage(soapMsg); + dispatchSM.invoke(request); + fail(); + } + catch (SOAPFaultException e) + { + assertFaultCode(e, false); + assertProblemHeaderQName(e); + } + } + + private static void assertProblemHeaderQName(final SOAPFaultException exception) throws SOAPException + { + String faultdetail[] = WsaSOAPUtils.getFaultDetail(exception); + if (faultdetail != null) + { + final String msg = "FaultDetail contains unexpected value got: " + faultdetail[0] + + ", expected: ProblemHeaderQName"; + assertTrue(msg, WsaSOAPUtils.isProblemHeaderQNameFaultDetail(faultdetail[0])); + } + } + + private static void assertFaultCode(final SOAPFaultException exception, final boolean anonymous) + throws SOAPException + { + final String faultCode = WsaSOAPUtils.getFaultCode(exception); + + if (anonymous) + { + final String msg = "SOAPFault contains unexpected faultcode got: " + faultCode + + ", expected: OnlyAnonymousAddressSupported"; + assertTrue(msg, WsaSOAPUtils.isOnlyAnonymousAddressSupportedFaultCode(exception)); + } + else + { + final String msg = "SOAPFault contains unexpected faultcode got: " + faultCode + + ", expected: OnlyNonAnonymousAddressSupported"; + assertTrue(msg, WsaSOAPUtils.isOnlyNonAnonymousAddressSupportedFaultCode(exception)); + } + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/AbstractSOAPHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/AbstractSOAPHandler.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/AbstractSOAPHandler.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,92 @@ +/* + * 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.jbws3022.common; + +import javax.xml.namespace.QName; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.test.ws.jaxws.common.ActionNotSupportedException; +import org.jboss.test.ws.jaxws.common.AddressingPropertyException; +import org.jboss.test.ws.jaxws.common.W3CAddressingConstants; +import org.jboss.test.ws.jaxws.common.WsaBaseSOAPHandler; + +public abstract class AbstractSOAPHandler extends WsaBaseSOAPHandler +{ + protected String getHeaderValue(final QName headerQName, final SOAPMessageContext messageCtx) + { + try + { + if (W3CAddressingConstants.WSA_TO_QNAME.equals(headerQName)) + { + return super.getTo(messageCtx); + } + else if (W3CAddressingConstants.WSA_REPLYTO_QNAME.equals(headerQName)) + { + return super.getReplyTo(messageCtx); + } + else if (W3CAddressingConstants.WSA_MESSAGEID_QNAME.equals(headerQName)) + { + return super.getMessageId(messageCtx); + } + else if (W3CAddressingConstants.WSA_RELATESTO_QNAME.equals(headerQName)) + { + return super.getRelatesTo(messageCtx); + } + else + { + throw new IllegalArgumentException(); + } + } + catch (Exception e) + { + throw new AddressingPropertyException("Addressing header " + headerQName + " not found"); + } + } + + protected void assertActionHeaderValue(final String expected, final String action) + { + if (!expected.equals(action)) + { + throw new ActionNotSupportedException("Expected: " + expected + ", Actual: " + action); + } + } + + protected void assertAnonymousAddressURI(final QName headerQName, final SOAPMessageContext messageCtx) + { + final String headerValue = this.getHeaderValue(headerQName, messageCtx); + + if (!headerValue.equals(W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS_URI)) + throw new AddressingPropertyException("Expected: " + headerQName + " = " + + W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS_URI + + ", Actual: " + headerQName + "=" + headerValue); + } + + protected void assertNonAnonymousAddressURI(final QName headerQName, final SOAPMessageContext messageCtx) + { + final String headerValue = this.getHeaderValue(headerQName, messageCtx); + + if (headerValue.equals(W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS_URI)) + throw new AddressingPropertyException("Expected: " + headerQName + " != " + + W3CAddressingConstants.WSA_ANONYMOUS_ADDRESS_URI + + ", Actual: " + headerQName + "=" + headerValue); + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/TestConstants.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/TestConstants.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/common/TestConstants.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3022.common; + +public class TestConstants +{ + public static final String TEST_ANONYMOUS_RESPONSES_ASSERTION_IN_ACTION = "http://example.com/AddNumbersPortType3/add"; + + public static final String TEST_ANONYMOUS_RESPONSES_ASSERTION_OUT_ACTION = "http://example.com/AddNumbersPortType3/addResponse"; + + public static final String TEST_NONANONYMOUS_RESPONSES_ASSERTION_IN_ACTION = "http://example.com/AddNumbersPortType4/add"; + + public static final String TEST_NONANONYMOUS_RESPONSES_ASSERTION_OUT_ACTION = "http://example.com/AddNumbersPortType4/addResponse"; +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbers.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbers.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbers.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,123 @@ +/* + * 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.jbws3022.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for addNumbers complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="addNumbers"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="number1" type="{http://www.w3.org/2001/XMLSchema}int" form="qualified"/> + * <element name="number2" type="{http://www.w3.org/2001/XMLSchema}int" form="qualified"/> + * <element name="testName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0" form="qualified"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addNumbers", propOrder = +{"number1", "number2", "testName"}) +public class AddNumbers +{ + + protected int number1; + + protected int number2; + + protected String testName; + + /** + * Gets the value of the number1 property. + * + */ + public int getNumber1() + { + return number1; + } + + /** + * Sets the value of the number1 property. + * + */ + public void setNumber1(int value) + { + this.number1 = value; + } + + /** + * Gets the value of the number2 property. + * + */ + public int getNumber2() + { + return number2; + } + + /** + * Sets the value of the number2 property. + * + */ + public void setNumber2(int value) + { + this.number2 = value; + } + + /** + * Gets the value of the testName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTestName() + { + return testName; + } + + /** + * Sets the value of the testName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTestName(String value) + { + this.testName = value; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,113 @@ +/* + * 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.jbws3022.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for AddNumbersException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AddNumbersException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="detail" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AddNumbersException", propOrder = +{"detail", "message"}) +public class AddNumbersException +{ + + @XmlElement(namespace = "") + protected String detail; + + @XmlElement(namespace = "") + protected String message; + + /** + * Gets the value of the detail property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDetail() + { + return detail; + } + + /** + * Sets the value of the detail property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDetail(String value) + { + this.detail = value; + } + + /** + * Gets the value of the message property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() + { + return message; + } + + /** + * Sets the value of the message property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) + { + this.message = value; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException_Exception.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException_Exception.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersException_Exception.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,75 @@ +/* + * 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.jbws3022.generated; + +import javax.xml.ws.WebFault; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebFault(name = "AddNumbersException", targetNamespace = "http://example.com/") +public class AddNumbersException_Exception extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private AddNumbersException faultInfo; + + /** + * + * @param message + * @param faultInfo + */ + public AddNumbersException_Exception(String message, AddNumbersException faultInfo) + { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param message + * @param faultInfo + * @param cause + */ + public AddNumbersException_Exception(String message, AddNumbersException faultInfo, Throwable cause) + { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersException + */ + public AddNumbersException getFaultInfo() + { + return faultInfo; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,68 @@ +/* + * 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.jbws3022.generated; + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.Action; +import javax.xml.ws.FaultAction; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebService(name = "AddNumbersPortType3", targetNamespace = "http://example.com/") +@HandlerChain(file = "AddNumbersPortType3_handler.xml") +@XmlSeeAlso( +{ObjectFactory.class}) +public interface AddNumbersPortType3 +{ + + /** + * + * @param number2 + * @param testName + * @param number1 + * @return + * returns int + * @throws AddNumbersException_Exception + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "addNumbers", targetNamespace = "http://example.com/", className = "org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbers") + @ResponseWrapper(localName = "addNumbersResponse", targetNamespace = "http://example.com/", className = "org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersResponse") + @Action(input = "http://example.com/AddNumbersPortType3/add", output = "http://example.com/AddNumbersPortType3/addResponse", fault = + {@FaultAction(className = AddNumbersException_Exception.class, value = "http://example.com/AddNumbersPortType3/addNumbers/Fault/AddNumbersException")}) + public int addNumbers(@WebParam(name = "number1", targetNamespace = "http://example.com/") int number1, + @WebParam(name = "number2", targetNamespace = "http://example.com/") int number2, + @WebParam(name = "testName", targetNamespace = "http://example.com/") String testName) + throws AddNumbersException_Exception; + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3_handler.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3_handler.xml (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType3_handler.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?><javaee:handler-chains xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>ClientSOAPHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3022.ClientSOAPHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> +</javaee:handler-chains> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,68 @@ +/* + * 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.jbws3022.generated; + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.Action; +import javax.xml.ws.FaultAction; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebService(name = "AddNumbersPortType4", targetNamespace = "http://example.com/") +@HandlerChain(file = "AddNumbersPortType4_handler.xml") +@XmlSeeAlso( +{ObjectFactory.class}) +public interface AddNumbersPortType4 +{ + + /** + * + * @param number2 + * @param testName + * @param number1 + * @return + * returns int + * @throws AddNumbersException_Exception + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "addNumbers", targetNamespace = "http://example.com/", className = "org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbers") + @ResponseWrapper(localName = "addNumbersResponse", targetNamespace = "http://example.com/", className = "org.jboss.test.ws.jaxws.jbws3022.generated.AddNumbersResponse") + @Action(input = "http://example.com/AddNumbersPortType4/add", output = "http://example.com/AddNumbersPortType4/addResponse", fault = + {@FaultAction(className = AddNumbersException_Exception.class, value = "http://example.com/AddNumbersPortType4/addNumbers/Fault/AddNumbersException")}) + public int addNumbers(@WebParam(name = "number1", targetNamespace = "http://example.com/") int number1, + @WebParam(name = "number2", targetNamespace = "http://example.com/") int number2, + @WebParam(name = "testName", targetNamespace = "http://example.com/") String testName) + throws AddNumbersException_Exception; + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4_handler.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4_handler.xml (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersPortType4_handler.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?><javaee:handler-chains xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>ClientSOAPHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3022.ClientSOAPHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> +</javaee:handler-chains> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersResponse.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersResponse.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersResponse.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,75 @@ +/* + * 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.jbws3022.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for addNumbersResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="addNumbersResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addNumbersResponse", propOrder = +{"_return"}) +public class AddNumbersResponse +{ + + @XmlElement(name = "return", namespace = "") + 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: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,131 @@ +/* + * 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.jbws3022.generated; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.jws.HandlerChain; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebServiceClient(name = "AddNumbersService3", targetNamespace = "http://example.com/", wsdlLocation = "file:/opt/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3/bin/AddNumbersService3.wsdl") +@HandlerChain(file = "AddNumbersService3_handler.xml") +public class AddNumbersService3 extends Service +{ + + private final static URL ADDNUMBERSSERVICE3_WSDL_LOCATION; + + private final static WebServiceException ADDNUMBERSSERVICE3_EXCEPTION; + + private final static QName ADDNUMBERSSERVICE3_QNAME = new QName("http://example.com/", "AddNumbersService3"); + + static + { + URL url = null; + WebServiceException e = null; + try + { + url = new URL( + "file:/opt/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3/bin/AddNumbersService3.wsdl"); + } + catch (MalformedURLException ex) + { + e = new WebServiceException(ex); + } + ADDNUMBERSSERVICE3_WSDL_LOCATION = url; + ADDNUMBERSSERVICE3_EXCEPTION = e; + } + + public AddNumbersService3() + { + super(__getWsdlLocation(), ADDNUMBERSSERVICE3_QNAME); + } + + public AddNumbersService3(WebServiceFeature... features) + { + super(__getWsdlLocation(), ADDNUMBERSSERVICE3_QNAME, features); + } + + public AddNumbersService3(URL wsdlLocation) + { + super(wsdlLocation, ADDNUMBERSSERVICE3_QNAME); + } + + public AddNumbersService3(URL wsdlLocation, WebServiceFeature... features) + { + super(wsdlLocation, ADDNUMBERSSERVICE3_QNAME, features); + } + + public AddNumbersService3(URL wsdlLocation, QName serviceName) + { + super(wsdlLocation, serviceName); + } + + public AddNumbersService3(URL wsdlLocation, QName serviceName, WebServiceFeature... features) + { + super(wsdlLocation, serviceName, features); + } + + /** + * + * @return + * returns AddNumbersPortType3 + */ + @WebEndpoint(name = "AddNumbersPort3") + public AddNumbersPortType3 getAddNumbersPort3() + { + return super.getPort(new QName("http://example.com/", "AddNumbersPort3"), AddNumbersPortType3.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns AddNumbersPortType3 + */ + @WebEndpoint(name = "AddNumbersPort3") + public AddNumbersPortType3 getAddNumbersPort3(WebServiceFeature... features) + { + return super.getPort(new QName("http://example.com/", "AddNumbersPort3"), AddNumbersPortType3.class, features); + } + + private static URL __getWsdlLocation() + { + if (ADDNUMBERSSERVICE3_EXCEPTION != null) + { + throw ADDNUMBERSSERVICE3_EXCEPTION; + } + return ADDNUMBERSSERVICE3_WSDL_LOCATION; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3_handler.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3_handler.xml (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService3_handler.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?><javaee:handler-chains xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>ClientSOAPHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3022.ClientSOAPHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> +</javaee:handler-chains> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,131 @@ +/* + * 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.jbws3022.generated; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.jws.HandlerChain; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebServiceClient(name = "AddNumbersService4", targetNamespace = "http://example.com/", wsdlLocation = "file:/opt/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3/bin/AddNumbersService4.wsdl") +@HandlerChain(file = "AddNumbersService4_handler.xml") +public class AddNumbersService4 extends Service +{ + + private final static URL ADDNUMBERSSERVICE4_WSDL_LOCATION; + + private final static WebServiceException ADDNUMBERSSERVICE4_EXCEPTION; + + private final static QName ADDNUMBERSSERVICE4_QNAME = new QName("http://example.com/", "AddNumbersService4"); + + static + { + URL url = null; + WebServiceException e = null; + try + { + url = new URL( + "file:/opt/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3/bin/AddNumbersService4.wsdl"); + } + catch (MalformedURLException ex) + { + e = new WebServiceException(ex); + } + ADDNUMBERSSERVICE4_WSDL_LOCATION = url; + ADDNUMBERSSERVICE4_EXCEPTION = e; + } + + public AddNumbersService4() + { + super(__getWsdlLocation(), ADDNUMBERSSERVICE4_QNAME); + } + + public AddNumbersService4(WebServiceFeature... features) + { + super(__getWsdlLocation(), ADDNUMBERSSERVICE4_QNAME, features); + } + + public AddNumbersService4(URL wsdlLocation) + { + super(wsdlLocation, ADDNUMBERSSERVICE4_QNAME); + } + + public AddNumbersService4(URL wsdlLocation, WebServiceFeature... features) + { + super(wsdlLocation, ADDNUMBERSSERVICE4_QNAME, features); + } + + public AddNumbersService4(URL wsdlLocation, QName serviceName) + { + super(wsdlLocation, serviceName); + } + + public AddNumbersService4(URL wsdlLocation, QName serviceName, WebServiceFeature... features) + { + super(wsdlLocation, serviceName, features); + } + + /** + * + * @return + * returns AddNumbersPortType4 + */ + @WebEndpoint(name = "AddNumbersPort4") + public AddNumbersPortType4 getAddNumbersPort4() + { + return super.getPort(new QName("http://example.com/", "AddNumbersPort4"), AddNumbersPortType4.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns AddNumbersPortType4 + */ + @WebEndpoint(name = "AddNumbersPort4") + public AddNumbersPortType4 getAddNumbersPort4(WebServiceFeature... features) + { + return super.getPort(new QName("http://example.com/", "AddNumbersPort4"), AddNumbersPortType4.class, features); + } + + private static URL __getWsdlLocation() + { + if (ADDNUMBERSSERVICE4_EXCEPTION != null) + { + throw ADDNUMBERSSERVICE4_EXCEPTION; + } + return ADDNUMBERSSERVICE4_WSDL_LOCATION; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4_handler.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4_handler.xml (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/AddNumbersService4_handler.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?><javaee:handler-chains xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>ClientSOAPHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3022.ClientSOAPHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> +</javaee:handler-chains> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/ObjectFactory.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/ObjectFactory.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/ObjectFactory.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,118 @@ +/* + * 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.jbws3022.generated; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jbws3022.generated package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory +{ + + private final static QName _AddNumbersException_QNAME = new QName("http://example.com/", "AddNumbersException"); + + private final static QName _AddNumbers_QNAME = new QName("http://example.com/", "addNumbers"); + + private final static QName _AddNumbersResponse_QNAME = new QName("http://example.com/", "addNumbersResponse"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws3022.generated + * + */ + public ObjectFactory() + { + } + + /** + * Create an instance of {@link AddNumbersResponse } + * + */ + public AddNumbersResponse createAddNumbersResponse() + { + return new AddNumbersResponse(); + } + + /** + * Create an instance of {@link AddNumbersException } + * + */ + public AddNumbersException createAddNumbersException() + { + return new AddNumbersException(); + } + + /** + * Create an instance of {@link AddNumbers } + * + */ + public AddNumbers createAddNumbers() + { + return new AddNumbers(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AddNumbersException }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.com/", name = "AddNumbersException") + public JAXBElement<AddNumbersException> createAddNumbersException(AddNumbersException value) + { + return new JAXBElement<AddNumbersException>(_AddNumbersException_QNAME, AddNumbersException.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AddNumbers }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.com/", name = "addNumbers") + public JAXBElement<AddNumbers> createAddNumbers(AddNumbers value) + { + return new JAXBElement<AddNumbers>(_AddNumbers_QNAME, AddNumbers.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AddNumbersResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.com/", name = "addNumbersResponse") + public JAXBElement<AddNumbersResponse> createAddNumbersResponse(AddNumbersResponse value) + { + return new JAXBElement<AddNumbersResponse>(_AddNumbersResponse_QNAME, AddNumbersResponse.class, null, value); + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/package-info.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/package-info.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/generated/package-info.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,23 @@ +/* + * 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. + */ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://example.com/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.jbws3022.generated; Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersException.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersException.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersException.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,38 @@ +/* + * 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.jbws3022.service; + +public class AddNumbersException extends Exception +{ + String detail; + + public AddNumbersException(String message, String detail) + { + super(message); + this.detail = detail; + } + + public String getDetail() + { + return detail; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,51 @@ +/* + * 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.jbws3022.service; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.HandlerChain; +import javax.xml.ws.Action; +import javax.xml.ws.soap.Addressing; +import javax.xml.ws.soap.AddressingFeature; + +@WebService(name = "AddNumbersPortType3", portName = "AddNumbersPort3", serviceName = "AddNumbersService3", targetNamespace = "http://example.com/", wsdlLocation="WEB-INF/wsdl/AddNumbersService3.wsdl") +@Addressing(enabled = true, required = true, responses = AddressingFeature.Responses.ANONYMOUS) +@HandlerChain(name = "", file = "server-handler.xml") +public class AddNumbersImpl3 +{ + @Action(input = "http://example.com/AddNumbersPortType3/add", output = "http://example.com/AddNumbersPortType3/addResponse") + @WebMethod + public int addNumbers(@WebParam(name = "number1", targetNamespace = "http://example.com/") int number1, + @WebParam(name = "number2", targetNamespace = "http://example.com/") int number2, + @WebParam(name = "testName", targetNamespace = "http://example.com/") String testName) + throws AddNumbersException + { + + if (number1 < 0 || number2 < 0) + { + throw new AddNumbersException("Negative numbers can't be added!", "Numbers: " + number1 + ", " + number2); + } + return number1 + number2; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,50 @@ +/* + * 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.jbws3022.service; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.HandlerChain; +import javax.xml.ws.Action; +import javax.xml.ws.soap.Addressing; +import javax.xml.ws.soap.AddressingFeature; + +@WebService(name = "AddNumbersPortType4", portName = "AddNumbersPort4", serviceName = "AddNumbersService4", targetNamespace = "http://example.com/", wsdlLocation="WEB-INF/wsdl/AddNumbersService4.wsdl") +@Addressing(enabled = true, required = true, responses = AddressingFeature.Responses.NON_ANONYMOUS) +@HandlerChain(name = "", file = "server-handler.xml") +public class AddNumbersImpl4 +{ + @Action(input = "http://example.com/AddNumbersPortType4/add", output = "http://example.com/AddNumbersPortType4/addResponse") + @WebMethod + public int addNumbers(@WebParam(name = "number1", targetNamespace = "http://example.com/") int number1, + @WebParam(name = "number2", targetNamespace = "http://example.com/") int number2, + @WebParam(name = "testName", targetNamespace = "http://example.com/") String testName) + throws AddNumbersException + { + if (number1 < 0 || number2 < 0) + { + throw new AddNumbersException("Negative numbers can't be added!", "Numbers: " + number1 + ", " + number2); + } + return number1 + number2; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/ServerSOAPHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/ServerSOAPHandler.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/ServerSOAPHandler.java 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,75 @@ +/* + * 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.jbws3022.service; + +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.test.ws.jaxws.common.Handler_Util; +import org.jboss.test.ws.jaxws.common.W3CAddressingConstants; +import org.jboss.test.ws.jaxws.jbws3022.common.AbstractSOAPHandler; +import org.jboss.test.ws.jaxws.jbws3022.common.TestConstants; + +public final class ServerSOAPHandler extends AbstractSOAPHandler +{ + protected String whichHandler() + { + return "ServerSOAPHandler"; + } + + protected void checkInboundAction(final SOAPMessageContext context, final String oper, final String action) + { + if (Handler_Util.checkForMsg(context, "testAnonymousResponsesAssertion")) + { + assertAnonymousResponsesAddressingHeaders(context, action); + } + else if (Handler_Util.checkForMsg(context, "testNonAnonymousResponsesAssertion")) + { + assertNonAnonymousResponsesAddressingHeaders(context, action); + } + } + + private void assertAnonymousResponsesAddressingHeaders(final SOAPMessageContext messageCtx, final String action) + { + super.assertActionHeaderValue(TestConstants.TEST_ANONYMOUS_RESPONSES_ASSERTION_IN_ACTION, action); + + final String messageID = super.getHeaderValue(W3CAddressingConstants.WSA_MESSAGEID_QNAME, messageCtx); + assert messageID != null; + + final String to = super.getHeaderValue(W3CAddressingConstants.WSA_TO_QNAME, messageCtx); + assert to != null; + + super.assertAnonymousAddressURI(W3CAddressingConstants.WSA_REPLYTO_QNAME, messageCtx); + } + + private void assertNonAnonymousResponsesAddressingHeaders(final SOAPMessageContext messageCtx, final String action) + { + super.assertActionHeaderValue(TestConstants.TEST_NONANONYMOUS_RESPONSES_ASSERTION_IN_ACTION, action); + + final String messageID = super.getHeaderValue(W3CAddressingConstants.WSA_MESSAGEID_QNAME, messageCtx); + assert messageID != null; + + final String to = super.getHeaderValue(W3CAddressingConstants.WSA_TO_QNAME, messageCtx); + assert to != null; + + super.assertNonAnonymousAddressURI(W3CAddressingConstants.WSA_REPLYTO_QNAME, messageCtx); + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/server-handler.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/server-handler.xml (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/server-handler.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"> + <handler-chain> + <handler> + <handler-name>ServerSOAPHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.jbws3022.service.ServerSOAPHandler</handler-class> + </handler> + </handler-chain> +</handler-chains> Added: framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/jboss-web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/jboss-web.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -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-jbws3022</context-root> +</jboss-web> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/web.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" 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 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>JBWS-3022 Test</display-name> + <servlet> + <servlet-name>org.jboss.test.ws.jaxws.jbws3022.service.AddNumbersImpl3</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3022.service.AddNumbersImpl3</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>org.jboss.test.ws.jaxws.jbws3022.service.AddNumbersImpl4</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3022.service.AddNumbersImpl4</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>org.jboss.test.ws.jaxws.jbws3022.service.AddNumbersImpl3</servlet-name> + <url-pattern>/jaxws/AddNumbers3</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>org.jboss.test.ws.jaxws.jbws3022.service.AddNumbersImpl4</servlet-name> + <url-pattern>/jaxws/AddNumbers4</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>54</session-timeout> + </session-config> +</web-app> + Added: framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService3.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService3.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService3.wsdl 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="AddNumbersService3" targetNamespace="http://example.com/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://example.com/" xmlns:wsa="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema targetNamespace="http://example.com/" version="1.0" xmlns:tns="http://example.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="AddNumbersException" type="tns:AddNumbersException"/> + <xs:element name="addNumbers" type="tns:addNumbers"/> + <xs:element name="addNumbersResponse" type="tns:addNumbersResponse"/> + <xs:complexType name="addNumbers"> + <xs:sequence> + <xs:element form="qualified" name="number1" type="xs:int"/> + <xs:element form="qualified" name="number2" type="xs:int"/> + <xs:element form="qualified" minOccurs="0" name="testName" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="addNumbersResponse"> + <xs:sequence> + <xs:element name="return" type="xs:int"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AddNumbersException"> + <xs:sequence> + <xs:element minOccurs="0" name="detail" type="xs:string"/> + <xs:element minOccurs="0" name="message" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name="AddNumbersException"> + <part element="tns:AddNumbersException" name="AddNumbersException"/> + </message> + <message name="AddNumbersPortType3_addNumbers"> + <part element="tns:addNumbers" name="addNumbers"/> + </message> + <message name="AddNumbersPortType3_addNumbersResponse"> + <part element="tns:addNumbersResponse" name="addNumbersResponse"/> + </message> + <portType name="AddNumbersPortType3"> + <operation name="addNumbers" parameterOrder="addNumbers"> + <input message="tns:AddNumbersPortType3_addNumbers" wsa:Action="http://example.com/AddNumbersPortType3/add"/> + <output message="tns:AddNumbersPortType3_addNumbersResponse" wsa:Action="http://example.com/AddNumbersPortType3/addResponse"/> + <fault message="tns:AddNumbersException" name="AddNumbersException" wsa:Action="http://example.com/AddNumbersPortType3/addNumbers/Fault/AddNumbersException"/> + </operation> + </portType> + <binding name="AddNumbersPortType3Binding" type="tns:AddNumbersPortType3"> + <wsp:PolicyReference URI="#a7bb8243-904e-4a6b-a7c0-afee3f99c9ec" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="addNumbers"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AddNumbersException"> + <soap:fault name="AddNumbersException" use="literal"/> + </fault> + </operation> + </binding> + <service name="AddNumbersService3"> + <port binding="tns:AddNumbersPortType3Binding" name="AddNumbersPort3"> + <soap:address location="http://localhost:8080/jaxws-jbws3022/jaxws/AddNumbers3"/> + </port> + </service> + <wsp:Policy wsu:Id="a7bb8243-904e-4a6b-a7c0-afee3f99c9ec" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + </wsp:Policy> +</definitions> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService4.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService4.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3022/WEB-INF/wsdl/AddNumbersService4.wsdl 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="AddNumbersService4" targetNamespace="http://example.com/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://example.com/" xmlns:wsa="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema targetNamespace="http://example.com/" version="1.0" xmlns:tns="http://example.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="AddNumbersException" type="tns:AddNumbersException"/> + <xs:element name="addNumbers" type="tns:addNumbers"/> + <xs:element name="addNumbersResponse" type="tns:addNumbersResponse"/> + <xs:complexType name="addNumbers"> + <xs:sequence> + <xs:element form="qualified" name="number1" type="xs:int"/> + <xs:element form="qualified" name="number2" type="xs:int"/> + <xs:element form="qualified" minOccurs="0" name="testName" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="addNumbersResponse"> + <xs:sequence> + <xs:element name="return" type="xs:int"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AddNumbersException"> + <xs:sequence> + <xs:element minOccurs="0" name="detail" type="xs:string"/> + <xs:element minOccurs="0" name="message" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name="AddNumbersPortType4_addNumbersResponse"> + <part element="tns:addNumbersResponse" name="addNumbersResponse"/> + </message> + <message name="AddNumbersException"> + <part element="tns:AddNumbersException" name="AddNumbersException"/> + </message> + <message name="AddNumbersPortType4_addNumbers"> + <part element="tns:addNumbers" name="addNumbers"/> + </message> + <portType name="AddNumbersPortType4"> + <operation name="addNumbers" parameterOrder="addNumbers"> + <input message="tns:AddNumbersPortType4_addNumbers" wsa:Action="http://example.com/AddNumbersPortType4/add"/> + <output message="tns:AddNumbersPortType4_addNumbersResponse" wsa:Action="http://example.com/AddNumbersPortType4/addResponse"/> + <fault message="tns:AddNumbersException" name="AddNumbersException" wsa:Action="http://example.com/AddNumbersPortType4/addNumbers/Fault/AddNumbersException"/> + </operation> + </portType> + <binding name="AddNumbersPortType4Binding" type="tns:AddNumbersPortType4"> + <wsp:PolicyReference URI="#7a647e5-d212-4ba9-a5c9-b4c643bb9099" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="addNumbers"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AddNumbersException"> + <soap:fault name="AddNumbersException" use="literal"/> + </fault> + </operation> + </binding> + <service name="AddNumbersService4"> + <port binding="tns:AddNumbersPortType4Binding" name="AddNumbersPort4"> + <soap:address location="http://localhost:8080/jaxws-jbws3022/jaxws/AddNumbers4"/> + </port> + </service> + <wsp:Policy wsu:Id="7a647e5-d212-4ba9-a5c9-b4c643bb9099" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + </wsp:Policy> +</definitions> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile3.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile3.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile3.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<jaxws:bindings + wsdlLocation="AddNumbersService3.wsdl" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <jaxws:bindings node="wsdl:definitions"> + <jaxws:package name="org.jboss.test.ws.jaxws.jbws3022.generated"/> + </jaxws:bindings> + <jaxws:bindings> + <javaee:handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>ClientSOAPHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3022.ClientSOAPHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </javaee:handler-chains> + </jaxws:bindings> +  + <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://example.com/']"> + <jaxb:schemaBindings> + <jaxb:package name="org.jboss.test.ws.jaxws.jbws3022.generated"/> + </jaxb:schemaBindings> + </jaxws:bindings> + +</jaxws:bindings> Added: framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile4.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile4.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3022/customfile4.xml 2010-05-12 10:38:37 UTC (rev 12211) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<jaxws:bindings + wsdlLocation="AddNumbersService4.wsdl" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <jaxws:bindings node="wsdl:definitions"> + <jaxws:package name="org.jboss.test.ws.jaxws.jbws3022.generated"/> + </jaxws:bindings> + <jaxws:bindings> + <javaee:handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>ClientSOAPHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3022.ClientSOAPHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </javaee:handler-chains> + </jaxws:bindings> +  + <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://example.com/']"> + <jaxb:schemaBindings> + <jaxb:package name="org.jboss.test.ws.jaxws.jbws3022.generated"/> + </jaxb:schemaBindings> + </jaxws:bindings> + +</jaxws:bindings>

14 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-12 03:15:27 -0400 (Wed, 12 May 2010) New Revision: 12210 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java Log: [JBWS-2960] fixing @Addressing.responses mapping to WSDL Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2010-05-12 07:13:01 UTC (rev 12209) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2010-05-12 07:15:27 UTC (rev 12210) @@ -217,12 +217,21 @@ } } - /* - * <wsp:Policy wsu:Id="SOME_ID"> - * <wsam:Addressing wsp:Optional="true"> - * <wsp:Policy/> - * </wsam:Addressing> - * </wsp:Policy> + /** + * JAX-WS 3.11 Service and Ports + * <p> + * Conformance (Use of Addressing): Endpoint’s use of addressing, if any, MUST be indicated in the + * wsdl:binding or wsdl:port sections of the WSDL 1.1 as per WS-Addressing 1.0 - Metadata. + * </p> + * <pre> + * <wsp:Policy wsu:Id="SOME_ID"> + * <wsam:Addressing wsp:Optional="true"> + * <wsp:Policy> + * <wsam:NonAnonymousResponses/> + * </wsp:Policy> + * </wsam:Addressing> + * </wsp:Policy> + * <pre> */ private String addAddressingPolicyDefinition(final AddressingFeature addressing) { @@ -241,6 +250,16 @@ } Element nestedPolicyElement = DOMUtils.createElement(new QName(WSP_NS, "Policy", "wsp")); addressingElement.appendChild(nestedPolicyElement); + if (addressing.getResponses() == AddressingFeature.Responses.ANONYMOUS) + { + Element anonymousResponsesElement = DOMUtils.createElement(new QName(WSAM_NS, "AnonymousResponses", "wsam")); + nestedPolicyElement.appendChild(anonymousResponsesElement); + } + else if (addressing.getResponses() == AddressingFeature.Responses.NON_ANONYMOUS) + { + Element anonymousResponsesElement = DOMUtils.createElement(new QName(WSAM_NS, "NonAnonymousResponses", "wsam")); + nestedPolicyElement.appendChild(anonymousResponsesElement); + } // bind policy to WSDL wsdl.addExtensibilityElement(new WSDLExtensibilityElement(WSP_NS, policyElement));

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12209 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-12 03:13:01 -0400 (Wed, 12 May 2010) New Revision: 12209 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java Log: [JBWS-2960] fixing @Addressing.responses mapping to WSDL - updated test Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.java 2010-05-12 06:35:06 UTC (rev 12208) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.java 2010-05-12 07:13:01 UTC (rev 12209) @@ -27,11 +27,12 @@ import javax.xml.ws.FaultAction; import javax.xml.ws.BindingType; import javax.xml.ws.soap.Addressing; +import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.soap.SOAPBinding; @WebService(name = "AddNumbers", portName = "AddNumbersPort", targetNamespace = "http://foobar.org/", serviceName = "AddNumbersService") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) -@Addressing +@Addressing(responses = AddressingFeature.Responses.NON_ANONYMOUS) public class AddNumbersImpl { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-12 06:35:06 UTC (rev 12208) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-12 07:13:01 UTC (rev 12209) @@ -50,10 +50,11 @@ { private static final QName WSAM_ACTION_QNAME = new QName("http://www.w3.org/2007/05/addressing/metadata", "Action"); private static final QName WSAM_ADDRESSING_QNAME = new QName("http://www.w3.org/2007/05/addressing/metadata", "Addressing"); + private static final QName WSAM_NON_ANONYMOUS_RESPONSES_QNAME = new QName("http://www.w3.org/2007/05/addressing/metadata", "NonAnonymousResponses"); private static final QName POLICY_QNAME = new QName("http://www.w3.org/ns/ws-policy", "Policy"); private static final QName POLICY_REFERENCE_QNAME = new QName("http://www.w3.org/ns/ws-policy", "PolicyReference"); private URL wsdlFile; - + public static Test suite() { return new JBossWSTestSetup(JBWS2960TestCase.class, "jaxws-jbws2960.war"); @@ -64,7 +65,7 @@ wsdlFile = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2960/Endpoint?wsdl"); assertNotNull("WSDL not found", wsdlFile); } - + /* <definitions targetNamespace="http://foobar.org/" @@ -76,7 +77,9 @@ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> <wsp:Policy wsu:Id="GENERATED_ID"> <wsam:Addressing wsp:Optional="true"> - <wsp:Policy/> + <wsp:Policy> + <wsam:NonAnonymousResponses/> + </wsp:Policy> </wsam:Addressing> </wsp:Policy> ... @@ -104,8 +107,12 @@ assertNotNull("Addressing element not found", addressingElement); String optionalAttributeValue = addressingElement.getAttributeNS("http://www.w3.org/ns/ws-policy", "Optional"); assertEquals("Addressing should be optional", "true", optionalAttributeValue); + Element nestedPolicyElement = DOMUtils.getFirstChildElement(addressingElement, POLICY_QNAME); + assertNotNull("Nested Policy element not found", nestedPolicyElement); + Element nonAnonymousResponsesElement = DOMUtils.getFirstChildElement(nestedPolicyElement, WSAM_NON_ANONYMOUS_RESPONSES_QNAME); + assertNotNull("NonAnonymousResponses element not found", nonAnonymousResponsesElement); } - + public void testOperations() throws Exception { Definition wsdl = getWSDLDefinition(wsdlFile); @@ -196,16 +203,16 @@ this.assertFault(operation, "http://foobar.org/AddNumbers/addNumbersFault7/Fault/AddNumbersException", "AddNumbersException"); this.assertFault(operation, "http://foobar.org/AddNumbers/addNumbersFault7/Fault/TooBigNumbersException", "TooBigNumbersException"); } - + private Operation getOperation(final PortType port, final String operationName) { return port.getOperation(operationName, null, null); } - + private void assertInput(final Operation operation, final String expectedValue) { QName wsamValue = (QName)operation.getInput().getExtensionAttribute(WSAM_ACTION_QNAME); - + log.debug("Validating input of operation " + operation.getName()); Assert.assertNotNull("No WSAM attr", wsamValue); Assert.assertEquals("Wrong WSAM attr. value", expectedValue, wsamValue.getLocalPart()); @@ -214,7 +221,7 @@ private void assertOutput(final Operation operation, final String expectedValue) { QName wsamValue = (QName)operation.getOutput().getExtensionAttribute(WSAM_ACTION_QNAME); - + log.debug("Validating output of operation " + operation.getName()); Assert.assertNotNull("No WSAM attr", wsamValue); Assert.assertEquals("Wrong WSAM attr. value", expectedValue, wsamValue.getLocalPart()); @@ -223,7 +230,7 @@ private void assertFault(final Operation operation, final String expectedValue, final String faultName) { QName wsamValue = (QName)operation.getFault(faultName).getExtensionAttribute(WSAM_ACTION_QNAME); - + log.debug("Validating fault '" + faultName + "' of operation " + operation.getName()); Assert.assertNotNull("No WSAM attr", wsamValue); Assert.assertEquals("Wrong WSAM attr. value", expectedValue, wsamValue.getLocalPart()); @@ -236,13 +243,13 @@ return wsdlReader.readWSDL(null, wsdlLocation.toURI().toString()); } - + @SuppressWarnings("unchecked") private Element getRequiredElement(final List extElements, final QName elementQName) { assertNotNull("No extensibility elements found", extElements); assertTrue("No extensibility elements found", extElements.size() > 0); - + Element retVal = null; for (int i = 0; i < extElements.size(); i++) { @@ -252,7 +259,7 @@ Element candidate = ((UnknownExtensibilityElement)extElements.get(i)).getElement(); boolean namespaceMatch = candidate.getNamespaceURI().equals(elementQName.getNamespaceURI()); boolean nameMatch = candidate.getLocalName().equals(elementQName.getLocalPart()); - + if (namespaceMatch && nameMatch) { retVal = candidate; @@ -260,7 +267,7 @@ } } } - + assertNotNull("Required element '" + elementQName + " ' not found", retVal); return retVal; }

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12208 - in common/branches/jbossws-common-1.1.0/src: main/java/org/jboss/wsf/common/injection/finders and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2010-05-12 02:35:06 -0400 (Wed, 12 May 2010) New Revision: 12208 Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java Log: [JBPAPP-3813]:Fixed windows issues in common module Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -140,8 +140,8 @@ try { //get the jar and open it - String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); - String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf("/")); + String filename = jarRoot.substring(jarRoot.lastIndexOf("/")+1); final File jar = new File(folder, filename); PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -151,8 +151,8 @@ try { - String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); - String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf("/")); + String filename = jarRoot.substring(jarRoot.lastIndexOf("/")+1); final File jar = new File(folder, filename); PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -37,7 +37,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a “set”, void return type and only one parameter. + * convention - name starts with a 'set', void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -36,7 +36,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a “set”, void return type and only one parameter. + * convention - name starts with a 'set', void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -72,7 +72,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children); Modified: common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -76,7 +76,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children);

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12207 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-12 02:30:36 -0400 (Wed, 12 May 2010) New Revision: 12207 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java Log: fixing compilation issue agains JAX-WS 2.2 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2010-05-12 03:14:11 UTC (rev 12206) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2010-05-12 06:30:36 UTC (rev 12207) @@ -123,7 +123,7 @@ String serviceImplClass = null; // #1 Use the explicit @WebServiceRef.value - if (wsref != null && wsref.value() != Object.class && wsref.value() != Service.class) + if (wsref != null && wsref.value() != Service.class) serviceImplClass = wsref.value().getName(); // #2 Use the target ref type

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12206 - in common/tags/jbossws-common-1.2.1.GA/src: main/java/org/jboss/wsf/common/injection/finders and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2010-05-11 23:14:11 -0400 (Tue, 11 May 2010) New Revision: 12206 Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java Log: Undo the change in revision 12202 Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-11 14:01:17 UTC (rev 12205) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-12 03:14:11 UTC (rev 12206) @@ -140,8 +140,8 @@ try { //get the jar and open it - String folder = jarRoot.substring(5,jarRoot.lastIndexOf('/')); - String filename = jarRoot.substring(jarRoot.lastIndexOf('/')+1); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); + String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); final File jar = new File(folder, filename); PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-11 14:01:17 UTC (rev 12205) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-12 03:14:11 UTC (rev 12206) @@ -147,13 +147,14 @@ String jarRoot = urlString.substring(4, urlString.indexOf("ar!") + 2); String path = urlString.contains("!") ? urlString.substring(urlString.lastIndexOf("!") + 2) : ""; if (path.endsWith(jarFileSeparator)) - path = path.substring(0, path.lastIndexOf(jarFileSeparator)); + path = path.substring(0, path.lastIndexOf(jarFileSeparator)); + try - { - System.out.println("jarRoot.lastIndexOf(File.separator) " + jarRoot.lastIndexOf('/')); - String folder = jarRoot.substring(5,jarRoot.lastIndexOf('/')); - String filename = jarRoot.substring(jarRoot.lastIndexOf('/')+1); + { + String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); + String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); final File jar = new File(folder, filename); + PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() { public JarFile run() Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-11 14:01:17 UTC (rev 12205) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-12 03:14:11 UTC (rev 12206) @@ -37,7 +37,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a 'set', void return type and only one parameter. + * convention - name starts with a “set”, void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-11 14:01:17 UTC (rev 12205) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-12 03:14:11 UTC (rev 12206) @@ -36,7 +36,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a 'set', void return type and only one parameter. + * convention - name starts with a “set”, void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-11 14:01:17 UTC (rev 12205) +++ common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-12 03:14:11 UTC (rev 12206) @@ -72,7 +72,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children); Modified: common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-11 14:01:17 UTC (rev 12205) +++ common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-12 03:14:11 UTC (rev 12206) @@ -76,7 +76,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children);

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12205 - stack/native/trunk/modules/core.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-11 10:01:17 -0400 (Tue, 11 May 2010) New Revision: 12205 Modified: stack/native/trunk/modules/core/pom.xml Log: fixing endorsing for modules/core compilation Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2010-05-11 13:59:04 UTC (rev 12204) +++ stack/native/trunk/modules/core/pom.xml 2010-05-11 14:01:17 UTC (rev 12205) @@ -170,12 +170,32 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <showDeprecation>false</showDeprecation> + <compilerArguments> + <endorseddirs>${project.build.directory}/endorsed</endorseddirs> + </compilerArguments> </configuration> </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> <id>copy-dependencies</id> <goals> <goal>unpack</goal>

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12204 - in stack/native/trunk/modules/testsuite/framework-tests: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-11 09:59:04 -0400 (Tue, 11 May 2010) New Revision: 12204 Removed: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml Log: [JBWS-2960] endorsing workaround - refactoring test. Since now WSDL is generated on endpoint deploy, and WSDL is generated using server runtime. Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-05-11 13:53:14 UTC (rev 12203) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-05-11 13:59:04 UTC (rev 12204) @@ -112,7 +112,6 @@ <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> <property name="tests.output.dir" value="${project.build.directory}" /> <property name="project.version" value="${project.version}" /> - <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" /> <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" /> <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" /> <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> Deleted: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-05-11 13:53:14 UTC (rev 12203) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-05-11 13:59:04 UTC (rev 12204) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - -<project> - -  -  -  - - <target name="wsprovide" description="Provide JAX-WS contracts"> - - <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> - <classpath> - <pathelement path="${maven.test.classpath}"/> - </classpath> - </taskdef> - - <wsprovide - genwsdl="true" - sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl" - classpath="${tests.output.dir}/test-classes" - destdir="${tests.output.dir}/test-resources/jaxws/jbws2960" - resourcedestdir="${tests.output.dir}/test-resources/jaxws/jbws2960" - /> - </target> - -</project>

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12203 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2960 and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-11 09:53:14 -0400 (Tue, 11 May 2010) New Revision: 12203 Added: framework/trunk/testsuite/test/resources/jaxws/jbws2960/ framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/web.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java Log: [JBWS-2960] endorsing workaround - refactoring test. Since now the endpoint is published and WSDL is generated on service deploy, thus no need to run command line tools from Java -> Maven -> ANT Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-11 09:54:40 UTC (rev 12202) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-11 13:53:14 UTC (rev 12203) @@ -883,6 +883,18 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2960.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2960/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2960/AddNumbersException.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2960/TooBigNumbersException.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2960/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2985.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2985/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-11 09:54:40 UTC (rev 12202) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-11 13:53:14 UTC (rev 12203) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2960; -import java.io.File; +import java.net.URL; import java.util.List; import javax.wsdl.Definition; @@ -34,10 +34,11 @@ import javax.xml.namespace.QName; import junit.framework.Assert; +import junit.framework.Test; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; /** @@ -51,12 +52,17 @@ private static final QName WSAM_ADDRESSING_QNAME = new QName("http://www.w3.org/2007/05/addressing/metadata", "Addressing"); private static final QName POLICY_QNAME = new QName("http://www.w3.org/ns/ws-policy", "Policy"); private static final QName POLICY_REFERENCE_QNAME = new QName("http://www.w3.org/ns/ws-policy", "PolicyReference"); - private final File wsdlFile = JBossWSTestHelper.getResourceFile("jaxws/jbws2960/AddNumbersService.wsdl"); + private URL wsdlFile; - public void setUp() + public static Test suite() { + return new JBossWSTestSetup(JBWS2960TestCase.class, "jaxws-jbws2960.war"); + } + + public void setUp() throws Exception + { + wsdlFile = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2960/Endpoint?wsdl"); assertNotNull("WSDL not found", wsdlFile); - assertTrue("WSDL doesn't exist", wsdlFile.exists()); } /* @@ -83,7 +89,7 @@ @SuppressWarnings("unchecked") public void testPolicyReference() throws Exception { - Definition wsdl = getWSDLDefinition(wsdlFile.getAbsolutePath()); + Definition wsdl = getWSDLDefinition(wsdlFile); List definitionExtElements = wsdl.getExtensibilityElements(); QName serviceQName = new QName("http://foobar.org/", "AddNumbersService"); Port wsdlPort = wsdl.getService(serviceQName).getPort("AddNumbersPort"); @@ -102,7 +108,7 @@ public void testOperations() throws Exception { - Definition wsdl = getWSDLDefinition(wsdlFile.getAbsolutePath()); + Definition wsdl = getWSDLDefinition(wsdlFile); PortType port = wsdl.getPortType(new QName("http://foobar.org/", "AddNumbers")); Operation operation = null; @@ -223,12 +229,12 @@ Assert.assertEquals("Wrong WSAM attr. value", expectedValue, wsamValue.getLocalPart()); } - private Definition getWSDLDefinition(final String wsdlLocation) throws Exception + private Definition getWSDLDefinition(final URL wsdlLocation) throws Exception { WSDLFactory wsdlFactory = WSDLFactory.newInstance(); WSDLReader wsdlReader = wsdlFactory.newWSDLReader(); - return wsdlReader.readWSDL(null, wsdlLocation); + return wsdlReader.readWSDL(null, wsdlLocation.toURI().toString()); } @SuppressWarnings("unchecked") Added: framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/jboss-web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/jboss-web.xml 2010-05-11 13:53:14 UTC (rev 12203) @@ -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-jbws2960</context-root> +</jboss-web> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2960/WEB-INF/web.xml 2010-05-11 13:53:14 UTC (rev 12203) @@ -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.jbws2960.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

14 years, 7 months

1
0
0 / 0

JBossWS SVN: r12202 - in common/tags/jbossws-common-1.2.1.GA/src: main/java/org/jboss/wsf/common/injection/finders and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2010-05-11 05:54:40 -0400 (Tue, 11 May 2010) New Revision: 12202 Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java Log: [JBPAPP-3813]:Fixed windows issues in common module Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-11 08:04:50 UTC (rev 12201) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-11 09:54:40 UTC (rev 12202) @@ -140,8 +140,8 @@ try { //get the jar and open it - String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); - String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf('/')); + String filename = jarRoot.substring(jarRoot.lastIndexOf('/')+1); final File jar = new File(folder, filename); PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-11 08:04:50 UTC (rev 12201) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-11 09:54:40 UTC (rev 12202) @@ -147,14 +147,13 @@ String jarRoot = urlString.substring(4, urlString.indexOf("ar!") + 2); String path = urlString.contains("!") ? urlString.substring(urlString.lastIndexOf("!") + 2) : ""; if (path.endsWith(jarFileSeparator)) - path = path.substring(0, path.lastIndexOf(jarFileSeparator)); - + path = path.substring(0, path.lastIndexOf(jarFileSeparator)); try - { - String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); - String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); + { + System.out.println("jarRoot.lastIndexOf(File.separator) " + jarRoot.lastIndexOf('/')); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf('/')); + String filename = jarRoot.substring(jarRoot.lastIndexOf('/')+1); final File jar = new File(folder, filename); - PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() { public JarFile run() Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-11 08:04:50 UTC (rev 12201) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-11 09:54:40 UTC (rev 12202) @@ -37,7 +37,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a “set”, void return type and only one parameter. + * convention - name starts with a 'set', void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-11 08:04:50 UTC (rev 12201) +++ common/tags/jbossws-common-1.2.1.GA/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-11 09:54:40 UTC (rev 12202) @@ -36,7 +36,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a “set”, void return type and only one parameter. + * convention - name starts with a 'set', void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-11 08:04:50 UTC (rev 12201) +++ common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-11 09:54:40 UTC (rev 12202) @@ -72,7 +72,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children); Modified: common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java =================================================================== --- common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-11 08:04:50 UTC (rev 12201) +++ common/tags/jbossws-common-1.2.1.GA/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-11 09:54:40 UTC (rev 12202) @@ -76,7 +76,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children);

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