Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2.xml Sun Dec 17 22:34:08 2017 @@ -21,7 +21,7 @@ <!-- ================================================= --> <!-- Parameters --> <!-- ================================================= --> - <parameter name="hotdeployment">true</parameter> + <parameter name="hotdeployment">false</parameter> <parameter name="hotupdate">false</parameter> <parameter name="enableMTOM">false</parameter> @@ -152,12 +152,12 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2_addressing.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2_addressing.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2_addressing.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/axis2_addressing.xml Sun Dec 17 22:34:08 2017 @@ -205,7 +205,7 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> @@ -214,7 +214,7 @@ </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/log4j.properties URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/log4j.properties?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/log4j.properties (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test-resources/log4j.properties Sun Dec 17 22:34:08 2017 @@ -36,7 +36,6 @@ log4j.rootCategory=ERROR, CONSOLE # Set the enterprise logger priority to FATAL log4j.logger.org.apache.axis2.enterprise=FATAL -log4j.logger.de.hunsicker.jalopy.io=FATAL log4j.logger.httpclient.wire.header=FATAL log4j.logger.org.apache.commons.httpclient=FATAL @@ -58,4 +57,4 @@ log4j.appender.SMALL=org.apache.log4j.Fi log4j.appender.SMALL.File=axis2.small.log log4j.appender.SMALL.Append=true log4j.appender.SMALL.layout=org.apache.log4j.PatternLayout -log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n \ No newline at end of file +log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java Sun Dec 17 22:34:08 2017 @@ -19,13 +19,11 @@ package org.apache.axis2.jaxws.anytype; -import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType; - import javax.jws.WebService; @WebService(serviceName="AnyTypeMessageService", targetNamespace="http://anytype.test.org";, - endpointInterface="org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType") + endpointInterface="org.apache.axis2.jaxws.anytype.AnyTypeMessagePortType") public class AnyTypeMessagePortTypeImpl implements AnyTypeMessagePortType { /* (non-Javadoc) Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java Sun Dec 17 22:34:08 2017 @@ -19,49 +19,39 @@ package org.apache.axis2.jaxws.anytype.tests; -import junit.framework.Test; -import junit.framework.TestSuite; import org.apache.axis2.jaxws.TestLogger; -import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType; -import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessageService; -import org.apache.axis2.jaxws.framework.AbstractTestCase; +import org.apache.axis2.jaxws.anytype.AnyTypeMessagePortType; +import org.apache.axis2.jaxws.anytype.AnyTypeMessageService; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; import javax.xml.ws.BindingProvider; -public class AnyTypeTests extends AbstractTestCase { +public class AnyTypeTests { + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo"); - String axisEndpoint = "http://localhost:6060/axis2/services/AnyTypeMessageService.AnyTypeMessagePortTypeImplPort";; - - public static Test suite() { - return getTestSetup(new TestSuite(AnyTypeTests.class)); - } - + @Test public void testAnyTypeElementinWrappedWSDL(){ - TestLogger.logger.debug("------------------------------"); - TestLogger.logger.debug("Test : " + getName()); - // Run test a few times to ensure correct _testAnyTypeElementinWrappedWSDL(); _testAnyTypeElementinWrappedWSDL(); _testAnyTypeElementinWrappedWSDL(); - - System.out.print("---------------------------------"); } public void _testAnyTypeElementinWrappedWSDL(){ - try{ - AnyTypeMessageService service = new AnyTypeMessageService(); - AnyTypeMessagePortType portType = service.getAnyTypePort(); - BindingProvider p = (BindingProvider) portType; - p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint); - - String req = new String("Request as String"); - Object response = portType.echoMessage(req); - assertTrue(response instanceof String); - TestLogger.logger.debug("Response =" + response); - }catch(Exception e){ - e.printStackTrace(); - fail(); - } + AnyTypeMessageService service = new AnyTypeMessageService(); + AnyTypeMessagePortType portType = service.getAnyTypePort(); + BindingProvider p = (BindingProvider) portType; + p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://localhost:"; + server.getPort() + "/axis2/services/AnyTypeMessageService.AnyTypeMessagePortTypeImplPort"); + + String req = new String("Request as String"); + Object response = portType.echoMessage(req); + assertTrue(response instanceof String); + TestLogger.logger.debug("Response =" + response); } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/MessageContextImpl.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/MessageContextImpl.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/MessageContextImpl.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/MessageContextImpl.java Sun Dec 17 22:34:08 2017 @@ -35,7 +35,7 @@ public class MessageContextImpl implemen @Resource WebServiceContext ctxt; - public static WebServiceContext webServiceContext = null; + public static volatile WebServiceContext webServiceContext = null; public void isPropertyPresent( Holder<String> propertyName, Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java Sun Dec 17 22:34:08 2017 @@ -51,7 +51,7 @@ public class MessageContextService e.printStackTrace(); } File file = new File(wsdlLocation); - url = file.toURL(); + url = file.toURI().toURL(); } catch (MalformedURLException e) { e.printStackTrace(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java Sun Dec 17 22:34:08 2017 @@ -21,16 +21,15 @@ package org.apache.axis2.jaxws.dispatch; import junit.framework.Test; import junit.framework.TestSuite; + +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.message.util.Reader2Writer; import org.w3c.dom.Document; import org.w3c.dom.Node; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.Dispatch; @@ -38,6 +37,7 @@ import javax.xml.ws.Response; import javax.xml.ws.Service; import javax.xml.ws.WebServiceException; import java.io.ByteArrayInputStream; +import java.io.StringWriter; import java.util.concurrent.Future; /** @@ -45,9 +45,6 @@ import java.util.concurrent.Future; * javax.xml.transform.dom.DOMSource */ public class DOMSourceDispatchTests extends AbstractTestCase{ - - private static final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - public static Test suite() { return getTestSetup(new TestSuite(DOMSourceDispatchTests.class)); } @@ -467,9 +464,8 @@ public class DOMSourceDispatchTests exte * @return */ private String createStringFromSource(Source input) throws Exception { - XMLStreamReader reader = inputFactory.createXMLStreamReader(input); - Reader2Writer r2w = new Reader2Writer(reader); - String text = r2w.getAsString(); - return text; + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(input).getDocument().serializeAndConsume(sw); + return sw.toString(); } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java Sun Dec 17 22:34:08 2017 @@ -21,12 +21,9 @@ package org.apache.axis2.jaxws.dispatch; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.StringReader; import javax.xml.namespace.QName; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; @@ -41,15 +38,11 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMSourcedElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.axiom.soap.SOAPBody; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.axiom.soap.SOAPEnvelope; -import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; +import org.apache.axiom.soap.SOAPModelBuilder; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.message.databinding.ParsedEntityReader; -import org.apache.axis2.jaxws.message.factory.ParsedEntityReaderFactory; -import org.apache.axis2.jaxws.registry.FactoryRegistry; /** * This class uses the JAX-WS Dispatch API to test sending and receiving @@ -67,10 +60,6 @@ public class OMElementDispatchTest exten "<test:echoOMElement xmlns:test=\"http://org/apache/axis2/jaxws/test/OMELEMENT\";>" + "<test:input>SAMPLE REQUEST MESSAGE</test:input>" + "</test:echoOMElement>"; - private static final String testResponse = - "<test:echoOMElement xmlns:test=\"http://org/apache/axis2/jaxws/test/OMELEMENT\";>" + - "<test:output>TEST RESPONSE MESSAGE</test:output>" + - "</test:echoOMElement>"; private static final String sampleEnvelopeHead = "<soapenv:Envelope xmlns:soapenv=\"http://www.w3.org/2003/05/soap-envelope\";>" + "<soapenv:Header /><soapenv:Body>"; @@ -81,8 +70,6 @@ public class OMElementDispatchTest exten sampleRequest + sampleEnvelopeTail; - private static XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - public static Test suite() { return getTestSetup(new TestSuite(OMElementDispatchTest.class)); } @@ -237,8 +224,7 @@ public class OMElementDispatchTest exten // Create the OMElement object with the payload contents. Since // we're in PAYLOAD mode, we don't have to worry about the envelope. StringReader sr = new StringReader(sampleRequest); - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXOMBuilder builder = new StAXOMBuilder(inputReader); + OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(sr); OMElement om = builder.getDocumentElement(); // Send the SOAP 1.2 request @@ -285,8 +271,7 @@ public class OMElementDispatchTest exten // Create the OMElement object with the payload contents. Since // we're in PAYLOAD mode, we don't have to worry about the envelope. StringReader sr = new StringReader(sampleEnvelope); - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null); + SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr); SOAPEnvelope soap12Envelope = (SOAPEnvelope) builder.getDocumentElement(); @@ -308,8 +293,7 @@ public class OMElementDispatchTest exten assertTrue(!responseText.contains("http://schemas.xmlsoap.org/soap/envelope";)); StringReader sr2 = new StringReader(sampleEnvelope); - inputReader = inputFactory.createXMLStreamReader(sr2); - builder = new StAXSOAPModelBuilder(inputReader, null); + builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr2); SOAPEnvelope om = (SOAPEnvelope)builder.getDocumentElement(); response = dispatch.invoke(om); @@ -327,80 +311,4 @@ public class OMElementDispatchTest exten assertTrue(responseText.contains("http://www.w3.org/2003/05/soap-envelope";)); assertTrue(!responseText.contains("http://schemas.xmlsoap.org/soap/envelope";)); } - - /** - * Test sending a SOAP 1.2 request in MESSAGE mode with - * a Parser that can provide the InputStream for the payload - */ - public void testOMElementDispatchWithParsedEntityReader() throws Exception { - - // Subsitute a ParsedEntityReader that will provide the - // payload InputStream. This simulates parsers that provide this - // feature. - ParsedEntityReaderFactory factory = (ParsedEntityReaderFactory) - FactoryRegistry.getFactory(ParsedEntityReaderFactory.class); - ParsedEntityReader per = new ParsedEntityReaderTest(); - factory.setParsetEntityReader(per); - - try { - // Create the JAX-WS client needed to send the request - Service service = Service.create(QNAME_SERVICE); - service.addPort(QNAME_PORT, SOAPBinding.SOAP12HTTP_BINDING, URL_ENDPOINT); - Dispatch<OMElement> dispatch = service.createDispatch( - QNAME_PORT, OMElement.class, Mode.MESSAGE); - - // Create the OMElement object with the payload contents. Since - // we're in PAYLOAD mode, we don't have to worry about the envelope. - StringReader sr = new StringReader(sampleEnvelope); - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null); - SOAPEnvelope soap12Envelope = (SOAPEnvelope) builder.getDocumentElement(); - - - // Invoke - OMElement response = dispatch.invoke(soap12Envelope); - - - SOAPEnvelope responseEnv = (SOAPEnvelope) response; - SOAPBody responseBody = responseEnv.getBody(); - OMElement payload = responseBody.getFirstElement(); - - // At this point, the payload should be an OMSourcedElement - // that was created from the ParsedEntityReader's stream - assertTrue(payload instanceof OMSourcedElement); - - - // Check to make sure the contents of the message are correct - String responseText = payload.toStringWithConsume(); - assertTrue(responseText.contains("TEST RESPONSE")); - } finally { - - // Uninstall the Test ParsedEntityReader - factory.setParsetEntityReader(null); - } - } - - /** - * The purpose of a ParsedEntityReader is to get the - * InputStream from the parser if it is available. - * Woodstox and other parsers don't provide that feature. - * To simulate this feature, this ParserEntityReaderTest is - * inserted to simulate getting a response from the Parser. - */ - public class ParsedEntityReaderTest implements ParsedEntityReader { - int count =0; - public boolean isParsedEntityStreamAvailable() { - return true; - } - - public InputStream readParsedEntityStream(XMLStreamReader reader) { - count++; - if (count == 2) { - return new ByteArrayInputStream(testResponse.getBytes()); - } else { - return null; - } - } - - } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java Sun Dec 17 22:34:08 2017 @@ -21,13 +21,12 @@ package org.apache.axis2.jaxws.dispatch; import junit.framework.Test; import junit.framework.TestSuite; + +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.message.util.Reader2Writer; import org.xml.sax.InputSource; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Source; import javax.xml.transform.sax.SAXSource; import javax.xml.ws.Dispatch; @@ -35,6 +34,7 @@ import javax.xml.ws.Response; import javax.xml.ws.Service; import javax.xml.ws.WebServiceException; import java.io.ByteArrayInputStream; +import java.io.StringWriter; import java.util.concurrent.Future; /** @@ -42,9 +42,6 @@ import java.util.concurrent.Future; * forms of a javax.xml.transform.sax.SAXSource. */ public class SAXSourceDispatchTests extends AbstractTestCase{ - - private static final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - public static Test suite() { return getTestSetup(new TestSuite(SAXSourceDispatchTests.class)); } @@ -71,9 +68,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -93,9 +90,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -128,9 +125,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -151,9 +148,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -194,9 +191,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -225,9 +222,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -268,9 +265,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -299,9 +296,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -339,9 +336,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -368,9 +365,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -408,9 +405,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -437,9 +434,9 @@ public class SAXSourceDispatchTests exte assertNotNull("dispatch invoke returned null", response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java Sun Dec 17 22:34:08 2017 @@ -21,12 +21,11 @@ package org.apache.axis2.jaxws.dispatch; import junit.framework.Test; import junit.framework.TestSuite; + +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.message.util.Reader2Writer; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.ws.Dispatch; @@ -35,6 +34,7 @@ import javax.xml.ws.Service; import javax.xml.ws.Service.Mode; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.io.StringWriter; import java.util.concurrent.Future; /** @@ -43,10 +43,6 @@ import java.util.concurrent.Future; * */ public class StreamSourceDispatchTests extends AbstractTestCase { - - private static XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - - public static Test suite() { return getTestSetup(new TestSuite(StreamSourceDispatchTests.class)); } @@ -75,9 +71,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -96,9 +92,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -131,9 +127,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -151,9 +147,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -197,9 +193,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -226,9 +222,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -272,9 +268,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -306,9 +302,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -348,9 +344,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -376,9 +372,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -419,9 +415,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - XMLStreamReader reader = inputFactory.createXMLStreamReader(response); - Reader2Writer r2w = new Reader2Writer(reader); - String responseText = r2w.getAsString(); + StringWriter sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + String responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct @@ -448,9 +444,9 @@ public class StreamSourceDispatchTests e assertNotNull(response); // Prepare the response content for checking - reader = inputFactory.createXMLStreamReader(response); - r2w = new Reader2Writer(reader); - responseText = r2w.getAsString(); + sw = new StringWriter(); + OMXMLBuilderFactory.createOMBuilder(response).getDocument().serializeAndConsume(sw); + responseText = sw.toString(); TestLogger.logger.debug(responseText); // Check to make sure the content is correct Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/server/OMElementProvider.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/server/OMElementProvider.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/server/OMElementProvider.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/server/OMElementProvider.java Sun Dec 17 22:34:08 2017 @@ -36,7 +36,6 @@ import org.apache.axiom.om.OMText; import org.apache.axiom.soap.SOAPBody; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; -import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory; /** * A Provider<OMElement> implementation used to test sending and @@ -68,7 +67,7 @@ public class OMElementProvider implement OMElement payload = createPayload(); - SOAPFactory factory = new SOAP12Factory(); + SOAPFactory factory = OMAbstractFactory.getSOAP12Factory(); SOAPEnvelope env = factory.createSOAPEnvelope(); SOAPBody body = factory.createSOAPBody(env); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java Sun Dec 17 22:34:08 2017 @@ -32,7 +32,7 @@ public class JAXBStringService e.printStackTrace(); } File file = new File(wsdlLocation); - url = file.toURL(); + url = file.toURI().toURL(); } catch (MalformedURLException e) { e.printStackTrace(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java Sun Dec 17 22:34:08 2017 @@ -49,22 +49,22 @@ public class JAXBContextTest extends Abs // Get a JAXBContext TreeSet<String> context1 = new TreeSet<String>(); context1.add("org.test.addnumbers"); - context1.add("org.test.anytype"); + context1.add("org.apache.axis2.jaxws.anytype"); JAXBContext jaxbContext1 = JAXBUtils.getJAXBContext(context1); // Assert that the JAXBContext was found and the context contains the two valid packages assertTrue(jaxbContext1 != null); assertTrue(context1.contains("org.test.addnumbers")); - assertTrue(context1.contains("org.test.anytype")); + assertTrue(context1.contains("org.apache.axis2.jaxws.anytype")); String context1String = jaxbContext1.toString(); assertTrue(context1String.contains("org.test.addnumbers")); - assertTrue(context1String.contains("org.test.anytype")); + assertTrue(context1String.contains("org.apache.axis2.jaxws.anytype")); // Repeat with the same packages TreeSet<String> context2 = new TreeSet<String>(); context2.add("org.test.addnumbers"); - context2.add("org.test.anytype"); + context2.add("org.apache.axis2.jaxws.anytype"); JAXBContext jaxbContext2 = JAXBUtils.getJAXBContext(context2); @@ -73,16 +73,16 @@ public class JAXBContextTest extends Abs assertTrue(jaxbContext2 != null); assertTrue(jaxbContext2.toString().equals(jaxbContext1.toString())); assertTrue(context2.contains("org.test.addnumbers")); - assertTrue(context2.contains("org.test.anytype")); + assertTrue(context2.contains("org.apache.axis2.jaxws.anytype")); String context2String = jaxbContext2.toString(); assertTrue(context2String.contains("org.test.addnumbers")); - assertTrue(context2String.contains("org.test.anytype")); + assertTrue(context2String.contains("org.apache.axis2.jaxws.anytype")); // Repeat with the same packages + an invalid package TreeSet<String> context3 = new TreeSet<String>(); context3.add("org.test.addnumbers"); - context3.add("org.test.anytype"); + context3.add("org.apache.axis2.jaxws.anytype"); context3.add("my.grandma.loves.jaxws"); JAXBContext jaxbContext3 = JAXBUtils.getJAXBContext(context3); @@ -92,11 +92,11 @@ public class JAXBContextTest extends Abs assertTrue(jaxbContext3 != null); assertTrue(context3.contains("org.test.addnumbers")); - assertTrue(context3.contains("org.test.anytype")); + assertTrue(context3.contains("org.apache.axis2.jaxws.anytype")); assertTrue(context3.contains("my.grandma.loves.jaxws")); String context3String = jaxbContext3.toString(); assertTrue(context3String.contains("org.test.addnumbers")); - assertTrue(context3String.contains("org.test.anytype")); + assertTrue(context3String.contains("org.apache.axis2.jaxws.anytype")); assertTrue(!context3String.contains("my.grandma.loves.jaxws")); // Repeat with a subset of packages @@ -119,7 +119,7 @@ public class JAXBContextTest extends Abs // Get a JAXBContext TreeSet<String> context1 = new TreeSet<String>(); context1.add("org.test.addnumbers"); - context1.add("org.test.anytype"); + context1.add("org.apache.axis2.jaxws.anytype"); context1.add("org.apache.axis2.jaxws.misc.jaxbexclude"); JAXBContext jaxbContext1 = JAXBUtils.getJAXBContext(context1); @@ -127,17 +127,17 @@ public class JAXBContextTest extends Abs // Assert that the JAXBContext was found and the context contains the two valid packages assertTrue(jaxbContext1 != null); assertTrue(context1.contains("org.test.addnumbers")); - assertTrue(context1.contains("org.test.anytype")); + assertTrue(context1.contains("org.apache.axis2.jaxws.anytype")); assertTrue(context1.contains("org.apache.axis2.jaxws.misc.jaxbexclude")); String context1String = jaxbContext1.toString(); assertTrue(context1String.contains("org.test.addnumbers")); - assertTrue(context1String.contains("org.test.anytype")); + assertTrue(context1String.contains("org.apache.axis2.jaxws.anytype")); assertTrue(!context1String.contains("org.apache.axis2.jaxws.misc.jaxbexclude")); // Repeat with the same packages TreeSet<String> context2 = new TreeSet<String>(); context2.add("org.test.addnumbers"); - context2.add("org.test.anytype"); + context2.add("org.apache.axis2.jaxws.anytype"); context2.add("org.apache.axis2.jaxws.misc.jaxbexclude"); JAXBContext jaxbContext2 = JAXBUtils.getJAXBContext(context2); @@ -147,16 +147,16 @@ public class JAXBContextTest extends Abs assertTrue(jaxbContext2 != null); assertTrue(jaxbContext2.toString().equals(jaxbContext1.toString())); assertTrue(context2.contains("org.test.addnumbers")); - assertTrue(context2.contains("org.test.anytype")); + assertTrue(context2.contains("org.apache.axis2.jaxws.anytype")); String context2String = jaxbContext2.toString(); assertTrue(context2String.contains("org.test.addnumbers")); - assertTrue(context2String.contains("org.test.anytype")); + assertTrue(context2String.contains("org.apache.axis2.jaxws.anytype")); assertTrue(!context2String.contains("org.apache.axis2.jaxws.misc.jaxbexclude")); // Repeat with the same packages + an invalid package TreeSet<String> context3 = new TreeSet<String>(); context3.add("org.test.addnumbers"); - context3.add("org.test.anytype"); + context3.add("org.apache.axis2.jaxws.anytype"); context3.add("my.grandma.loves.jaxws"); context3.add("org.apache.axis2.jaxws.misc.jaxbexclude"); @@ -167,11 +167,11 @@ public class JAXBContextTest extends Abs assertTrue(jaxbContext3 != null); assertTrue(jaxbContext3.toString().equals(jaxbContext3.toString())); assertTrue(context3.contains("org.test.addnumbers")); - assertTrue(context3.contains("org.test.anytype")); + assertTrue(context3.contains("org.apache.axis2.jaxws.anytype")); assertTrue(context3.contains("my.grandma.loves.jaxws")); String context3String = jaxbContext3.toString(); assertTrue(context3String.contains("org.test.addnumbers")); - assertTrue(context3String.contains("org.test.anytype")); + assertTrue(context3String.contains("org.apache.axis2.jaxws.anytype")); assertTrue(!context3String.contains("my.grandma.loves.jaxws")); assertTrue(!context3String.contains("org.apache.axis2.jaxws.misc.jaxbexclude")); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/EchoMessageImpl.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/EchoMessageImpl.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/EchoMessageImpl.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/EchoMessageImpl.java Sun Dec 17 22:34:08 2017 @@ -23,13 +23,12 @@ package org.apache.axis2.jaxws.nonanonymous.complextype; import org.apache.axis2.jaxws.TestLogger; -import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessagePortType; import javax.jws.WebService; @WebService(serviceName="EchoMessageService", targetNamespace="http://testApp.jaxws";, - endpointInterface="org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessagePortType") + endpointInterface="org.apache.axis2.jaxws.nonanonymous.complextype.EchoMessagePortType") public class EchoMessageImpl implements EchoMessagePortType { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java Sun Dec 17 22:34:08 2017 @@ -26,8 +26,6 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessagePortType; -import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessageService; import javax.xml.ws.BindingProvider; import javax.xml.ws.WebServiceException; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java Sun Dec 17 22:34:08 2017 @@ -100,7 +100,7 @@ public class PolymorphicTests extends Ab fail(); } File file = new File(wsdlLocation); - url = file.toURL(); + url = file.toURI().toURL(); WSDLWrapper wsdlWrapper = new WSDL4JWrapper(url); org.apache.axis2.jaxws.wsdl.SchemaReader sr= new SchemaReaderImpl(); Set<String> set= sr.readPackagesFromSchema(wsdlWrapper.getDefinition()); @@ -149,7 +149,7 @@ public class PolymorphicTests extends Ab fail(); } File file = new File(wsdlLocation); - url = file.toURL(); + url = file.toURI().toURL(); WSDLWrapper wsdlWrapper = new WSDL4JWrapper(url); org.apache.axis2.jaxws.wsdl.SchemaReader sr= new SchemaReaderImpl(); Set<String> set= sr.readPackagesFromSchema(wsdlWrapper.getDefinition()); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java Sun Dec 17 22:34:08 2017 @@ -230,7 +230,7 @@ public class AddressingProviderTests ext String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath(); wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath(); File file = new File(wsdlLocation); - return file.toURL(); + return file.toURI().toURL(); } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/OMProviderTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/OMProviderTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/OMProviderTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/OMProviderTests.java Sun Dec 17 22:34:08 2017 @@ -1,13 +1,12 @@ package org.apache.axis2.jaxws.provider; import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPEnvelope; -import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; +import org.apache.axiom.soap.SOAPModelBuilder; import org.apache.axis2.jaxws.Constants; import javax.xml.namespace.QName; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.ws.BindingProvider; import javax.xml.ws.Dispatch; import javax.xml.ws.Service; @@ -46,7 +45,6 @@ public class OMProviderTests extends Pro private static String request = "<invokeOp>Hello Provider OM</invokeOp>"; private static String SOAPFaultRequest ="<invokeOp>SOAPFault</invokeOp>"; - private static XMLInputFactory inputFactory = XMLInputFactory.newInstance(); public static Test suite() { return getTestSetup(new TestSuite(OMProviderTests.class)); @@ -68,8 +66,7 @@ public class OMProviderTests extends Pro // Create the OMElement object with the payload contents. Since // we're in PAYLOAD mode, we don't have to worry about the envelope. StringReader sr = new StringReader(SOAP11_ENVELOPE_HEAD+request+SOAP11_ENVELOPE_TAIL); - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null); + SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr); SOAPEnvelope om = (SOAPEnvelope) builder.getDocumentElement(); @@ -95,8 +92,7 @@ public class OMProviderTests extends Pro portName, OMElement.class, Mode.MESSAGE); StringReader sr = new StringReader(SOAP11_ENVELOPE_HEAD+SOAPFaultRequest+SOAP11_ENVELOPE_TAIL); - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null); + SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr); SOAPEnvelope om = (SOAPEnvelope) builder.getDocumentElement(); OMElement response = null; try{ @@ -118,8 +114,7 @@ public class OMProviderTests extends Pro bp.getRequestContext().put(Constants.THROW_EXCEPTION_IF_SOAP_FAULT, Boolean.FALSE); StringReader sr = new StringReader(SOAP11_ENVELOPE_HEAD+SOAPFaultRequest+SOAP11_ENVELOPE_TAIL); - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null); + SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr); SOAPEnvelope om = (SOAPEnvelope) builder.getDocumentElement(); OMElement response = null; try{ Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/om/OMProvider.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/om/OMProvider.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/om/OMProvider.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/om/OMProvider.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,9 @@ package org.apache.axis2.jaxws.provider.om; import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPEnvelope; -import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; +import org.apache.axiom.soap.SOAPModelBuilder; import javax.xml.namespace.QName; import javax.xml.soap.Detail; @@ -32,8 +33,6 @@ import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPFactory; import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPMessage; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.ws.Provider; import javax.xml.ws.Service; import javax.xml.ws.ServiceMode; @@ -65,7 +64,7 @@ public class OMProvider implements Provi private static String response = "<invokeOp>Hello Dispatch OM</invokeOp>"; - private static XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + public OMElement invoke(OMElement om) throws SOAPFaultException{ try{ StringReader sr = null; @@ -83,8 +82,7 @@ public class OMProvider implements Provi }else{ sr = new StringReader(SOAP11_ENVELOPE_HEAD+"null request"+SOAP11_ENVELOPE_TAIL); } - XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr); - StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null); + SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr); SOAPEnvelope responseOM = (SOAPEnvelope) builder.getDocumentElement(); return responseOM; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java Sun Dec 17 22:34:08 2017 @@ -46,8 +46,8 @@ public class AsyncCallback implements As TestLogger.logger.debug(">>Return String = " + type.getReturnStr()); return; } - if(obj instanceof org.test.proxy.doclitnonwrapped.ReturnType){ - org.test.proxy.doclitnonwrapped.ReturnType returnType = (org.test.proxy.doclitnonwrapped.ReturnType)obj; + if(obj instanceof org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType){ + org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType returnType = (org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType)obj; TestLogger.logger.debug(">>Return String = " + returnType.getReturnStr()); return; } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java Sun Dec 17 22:34:08 2017 @@ -21,10 +21,12 @@ package org.apache.axis2.jaxws.proxy; import junit.framework.Test; import junit.framework.TestSuite; + import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; import org.apache.axis2.jaxws.message.databinding.JAXBUtilsMonitor; import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface; +import org.junit.Ignore; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; @@ -33,6 +35,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Dispatch; import javax.xml.ws.Service; + import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -62,7 +65,7 @@ public class GorillaDLWProxyTests extend */ public GorillaInterface getProxy() throws MalformedURLException { File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); Object proxy =service.getPort(portName, GorillaInterface.class); BindingProvider p = (BindingProvider)proxy; @@ -78,7 +81,7 @@ public class GorillaDLWProxyTests extend */ public Dispatch<String> getDispatch() throws MalformedURLException { File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); service.addPort(portName, null, axisEndpoint); Dispatch<String> dispatch = service.createDispatch(portName, String.class, Service.Mode.PAYLOAD); @@ -307,7 +310,14 @@ public class GorillaDLWProxyTests extend * Test of String Array (string maxOccurs=unbounded) * @throws Exception */ - public void testEchoIndexedStringArray() throws Exception { + // With collectionType="indexed" XJC generates a setter with the following signature: + // public String setData(int idx, String value) + // Because of the return type, this is not the expected setter for an indexed JavaBeans + // property. This nevertheless works with Java 6, but the introspector in Java 7 no longer + // recognizes the property as an indexed property. Instead it considers it as a simple + // property with type String[] (because XJC also generates the corresponding getters and + // setters). + public void ignored_testEchoIndexedStringArray() throws Exception { // Run the test multiple times to verify correct behavior _testEchoIndexedStringArray(); _testEchoIndexedStringArray(); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java Sun Dec 17 22:34:08 2017 @@ -23,18 +23,16 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.DocLitnonWrappedProxy; -import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.ProxyDocLitUnwrappedService; -import org.test.proxy.doclitnonwrapped.Invoke; -import org.test.proxy.doclitnonwrapped.ObjectFactory; -import org.test.proxy.doclitnonwrapped.ReturnType; +import org.apache.axis2.jaxws.proxy.doclitnonwrapped.DocLitnonWrappedProxy; +import org.apache.axis2.jaxws.proxy.doclitnonwrapped.Invoke; +import org.apache.axis2.jaxws.proxy.doclitnonwrapped.ObjectFactory; +import org.apache.axis2.jaxws.proxy.doclitnonwrapped.ProxyDocLitUnwrappedService; +import org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType; import javax.xml.namespace.QName; import javax.xml.ws.AsyncHandler; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; import java.util.concurrent.Future; /** @@ -46,7 +44,6 @@ public class ProxyNonWrappedTests extend QName serviceName = new QName("http://doclitnonwrapped.proxy.test.org";, "ProxyDocLitUnwrappedService"); private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitUnwrappedService.DocLitnonWrappedImplPort";; private QName portName = new QName("http://org.apache.axis2.proxy.doclitwrapped";, "ProxyDocLitWrappedPort"); - private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test-resources/wsdl/ProxyDocLitnonWrapped.wsdl"; public static Test suite() { return getTestSetup(new TestSuite(ProxyNonWrappedTests.class)); @@ -104,17 +101,14 @@ public class ProxyNonWrappedTests extend try{ TestLogger.logger.debug("---------------------------------------"); TestLogger.logger.debug("DocLitNonWrapped test case: " + getName()); - //Create wsdl url - File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); ObjectFactory factory = new ObjectFactory(); //create input object to web service operation Invoke invokeObj = factory.createInvoke(); invokeObj.setInvokeStr("test request for twoWay Async Operation"); //Create Service - ProxyDocLitUnwrappedService service = new ProxyDocLitUnwrappedService(wsdlUrl, serviceName); + ProxyDocLitUnwrappedService service = new ProxyDocLitUnwrappedService(); //Create proxy - DocLitnonWrappedProxy proxy = service.getProxyDocLitnonWrappedPort(); + DocLitnonWrappedProxy proxy = service.getDocLitnonWrappedImplPort(); TestLogger.logger.debug(">>Invoking Binding Provider property"); //Setup Endpoint url -- optional. BindingProvider p = (BindingProvider)proxy; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.axis2.jaxws.TestLogger; import org.apache.axis2.jaxws.framework.AbstractTestCase; -import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.DocLitWrappedProxy; -import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.ProxyDocLitWrappedService; -import org.test.proxy.doclitwrapped.ReturnType; +import org.apache.axis2.jaxws.proxy.doclitwrapped.DocLitWrappedProxy; +import org.apache.axis2.jaxws.proxy.doclitwrapped.ProxyDocLitWrappedService; +import org.apache.axis2.jaxws.proxy.doclitwrapped.ReturnType; import javax.xml.namespace.QName; import javax.xml.ws.AsyncHandler; @@ -82,7 +82,7 @@ public class ProxyTests extends Abstract TestLogger.logger.debug("---------------------------------------"); TestLogger.logger.debug("Test Name: " + getName()); File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); Object proxy =service.getPort(portName, DocLitWrappedProxy.class); TestLogger.logger.debug(">>Invoking Binding Provider property"); @@ -108,7 +108,7 @@ public class ProxyTests extends Abstract TestLogger.logger.debug("---------------------------------------"); File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); String request = new String("some string request"); Object proxy =service.getPort(portName, DocLitWrappedProxy.class); @@ -133,7 +133,7 @@ public class ProxyTests extends Abstract } TestLogger.logger.debug("---------------------------------------"); File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(wsdlUrl, serviceName); String request = new String("some string request"); Object proxy =service.getPort(portName, DocLitWrappedProxy.class); @@ -159,7 +159,7 @@ public class ProxyTests extends Abstract TestLogger.logger.debug("---------------------------------------"); File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); String request = new String("some string request"); Object proxy =service.getPort(portName, DocLitWrappedProxy.class); @@ -182,7 +182,7 @@ public class ProxyTests extends Abstract TestLogger.logger.debug("---------------------------------------"); File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); DocLitWrappedProxy proxy =service.getPort(portName, DocLitWrappedProxy.class); @@ -220,7 +220,7 @@ public class ProxyTests extends Abstract return; } File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); String request = new String("some string request"); @@ -250,7 +250,7 @@ public class ProxyTests extends Abstract return; } File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); String request = new String("some string request"); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java Sun Dec 17 22:34:08 2017 @@ -80,7 +80,7 @@ public class RPCLitSWAProxyTests extends public RPCLitSWA getProxy() throws MalformedURLException { File wsdl= new File(wsdlLocation); assertTrue("WSDL does not exist:" + wsdlLocation,wsdl.exists()); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(wsdlUrl, serviceName); Object proxy =service.getPort(portName, RPCLitSWA.class); BindingProvider p = (BindingProvider)proxy; @@ -96,7 +96,7 @@ public class RPCLitSWAProxyTests extends */ public Dispatch<String> getDispatch() throws MalformedURLException { File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); service.addPort(portName, null, axisEndpoint); Dispatch<String> dispatch = service.createDispatch(portName, String.class, Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java Sun Dec 17 22:34:08 2017 @@ -61,7 +61,7 @@ public class RPCProxyTests extends Abstr */ public RPCLit getProxy() throws MalformedURLException { File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); Object proxy =service.getPort(portName, RPCLit.class); BindingProvider p = (BindingProvider)proxy; @@ -77,7 +77,7 @@ public class RPCProxyTests extends Abstr */ public Dispatch<String> getDispatch() throws MalformedURLException { File wsdl= new File(wsdlLocation); - URL wsdlUrl = wsdl.toURL(); + URL wsdlUrl = wsdl.toURI().toURL(); Service service = Service.create(null, serviceName); service.addPort(portName, null, axisEndpoint); Dispatch<String> dispatch = service.createDispatch(portName, String.class, Service.Mode.PAYLOAD); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl Sun Dec 17 22:34:08 2017 @@ -69,7 +69,10 @@ </wsdl:message> <wsdl:portType name="DocLitnonWrappedProxy"> - + <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws";> + <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle> + <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping> + </jaxws:bindings> <wsdl:operation name="invoke"> <wsdl:input message="tns:invokeRequest" /> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl Sun Dec 17 22:34:08 2017 @@ -189,6 +189,9 @@ </wsdl:message> <wsdl:portType name="DocLitWrappedProxy"> + <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws";> + <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping> + </jaxws:bindings> <wsdl:operation name="oneWayVoid"> <wsdl:input message="tns:oneWayVoidRequest" /> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/AssertFault.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/AssertFault.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/AssertFault.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/AssertFault.java Sun Dec 17 22:34:08 2017 @@ -1,73 +1,73 @@ - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.axis2.jaxws.proxy.gorilla_dlw.sei; - -import javax.xml.ws.WebFault; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0_01-b15-fcs - * Generated source version: 2.0 - * - */ -@WebFault(name = "assertFault", targetNamespace = "http://org/apache/axis2/jaxws/proxy/gorilla_dlw/data";) -public class AssertFault - extends Exception -{ - - /** - * Java type that goes as soapenv:Fault detail element. - * - */ - private org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault faultInfo; - - /** - * - * @param message - * @param faultInfo - */ - public AssertFault(String message, org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * - * @param cause - * @param message - * @param faultInfo - */ - public AssertFault(String message, org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * - * @return - * returns fault bean: org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault - */ - public org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault getFaultInfo() { - return faultInfo; - } - -} + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.axis2.jaxws.proxy.gorilla_dlw.sei; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0_01-b15-fcs + * Generated source version: 2.0 + * + */ +@WebFault(name = "assertFault", targetNamespace = "http://org/apache/axis2/jaxws/proxy/gorilla_dlw/data";) +public class AssertFault + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault faultInfo; + + /** + * + * @param message + * @param faultInfo + */ + public AssertFault(String message, org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param cause + * @param message + * @param faultInfo + */ + public AssertFault(String message, org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault + */ + public org.apache.axis2.jaxws.proxy.gorilla_dlw.data.AssertFault getFaultInfo() { + return faultInfo; + } + +} Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/AssertFault.java ------------------------------------------------------------------------------ svn:eol-style = native
