Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/generics/generics.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/generics/generics.wsdl?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/generics/generics.wsdl (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/generics/generics.wsdl Sun Dec 17 22:34:08 2017 @@ -17,11 +17,12 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="processStringArray"> + <!-- TODO: This isn't correct; the processStringArray method has an argument --> + <!-- xs:element name="processStringArray"> <xs:complexType> <xs:sequence/> </xs:complexType> - </xs:element> + </xs:element --> <xs:element name="processPersonList"> <xs:complexType> <xs:sequence> @@ -58,9 +59,9 @@ </xs:complexType> </xs:schema> </wsdl:types> - <wsdl:message name="processStringArrayRequest"> + <!-- wsdl:message name="processStringArrayRequest"> <wsdl:part name="parameters" element="ns:processStringArray"/> - </wsdl:message> + </wsdl:message --> <wsdl:message name="processStringListRequest"> <wsdl:part name="parameters" element="ns:processStringList"/> </wsdl:message> @@ -80,9 +81,9 @@ <wsdl:part name="parameters" element="ns:getStringListResponse"/> </wsdl:message> <wsdl:portType name="GenericServicePortType"> - <wsdl:operation name="processStringArray"> + <!-- wsdl:operation name="processStringArray"> <wsdl:input message="ns:processStringArrayRequest" wsaw:Action="urn:processStringArray"/> - </wsdl:operation> + </wsdl:operation --> <wsdl:operation name="processStringList"> <wsdl:input message="ns:processStringListRequest" wsaw:Action="urn:processStringList"/> <wsdl:output message="ns:processStringListResponse" wsaw:Action="urn:processStringListResponse"/> @@ -98,12 +99,12 @@ </wsdl:portType> <wsdl:binding name="GenericServiceSoap11Binding" type="ns:GenericServicePortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> - <wsdl:operation name="processStringArray"> + <!-- wsdl:operation name="processStringArray"> <soap:operation soapAction="urn:processStringArray" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> - </wsdl:operation> + </wsdl:operation --> <wsdl:operation name="processStringList"> <soap:operation soapAction="urn:processStringList" style="document"/> <wsdl:input> @@ -134,12 +135,12 @@ </wsdl:binding> <wsdl:binding name="GenericServiceSoap12Binding" type="ns:GenericServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> - <wsdl:operation name="processStringArray"> + <!-- wsdl:operation name="processStringArray"> <soap12:operation soapAction="urn:processStringArray" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> - </wsdl:operation> + </wsdl:operation --> <wsdl:operation name="processStringList"> <soap12:operation soapAction="urn:processStringList" style="document"/> <wsdl:input> @@ -170,12 +171,12 @@ </wsdl:binding> <wsdl:binding name="GenericServiceHttpBinding" type="ns:GenericServicePortType"> <http:binding verb="POST"/> - <wsdl:operation name="processStringArray"> + <!-- wsdl:operation name="processStringArray"> <http:operation location="processStringArray"/> <wsdl:input> <mime:content type="application/xml" part="parameters"/> </wsdl:input> - </wsdl:operation> + </wsdl:operation --> <wsdl:operation name="processStringList"> <http:operation location="processStringList"/> <wsdl:input>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -277,7 +277,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> @@ -286,7 +286,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/integration/test-resources/mtom/MTOM-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -59,7 +59,7 @@ <!-- Transport Outs --> <!-- ================================================= --> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> </transportSender> <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -61,7 +61,7 @@ <!-- Transport Outs --> <!-- ================================================= --> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> </transportSender> <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -63,7 +63,7 @@ <!-- Transport Outs --> <!-- ================================================= --> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> </transportSender> <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -65,7 +65,7 @@ <!-- Transport Outs --> <!-- ================================================= --> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> </transportSender> <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java Sun Dec 17 22:34:08 2017 @@ -136,7 +136,7 @@ public class AsyncServiceTest extends Ut } /** This is called at the end of the MEP no matter what happens, quite like a finally block. */ - public void onComplete() { + public synchronized void onComplete() { finish = true; notify(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java Sun Dec 17 22:34:08 2017 @@ -19,24 +19,10 @@ package org.apache.axis2.deployment; -import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.integration.LocalTestCase; -import org.apache.axis2.context.ServiceContext; -import org.apache.axis2.service.Lifecycle; public class LifecycleTest extends LocalTestCase { - static public class Service implements Lifecycle { - static boolean initCalled, destroyCalled; - - public void init(ServiceContext context) throws AxisFault { - initCalled = true; - } - - public void destroy(ServiceContext context) { - destroyCalled = true; - } - } public void testServiceObjectLifecycle() throws Exception { deployClassAsService("lifecycle", Service.class, Constants.SCOPE_APPLICATION); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java Sun Dec 17 22:34:08 2017 @@ -43,7 +43,7 @@ import org.apache.axis2.dispatchers.SOAP import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver; import org.apache.axis2.receivers.RawXMLINOutMessageReceiver; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import javax.xml.namespace.QName; import java.util.ArrayList; @@ -70,7 +70,7 @@ public class EnginePausingTest extends T configContext.setServicePath(Constants.DEFAULT_SERVICES_PATH); configContext.setContextRoot("axis2"); transportOut = new TransportOutDescription("null"); - transportOut.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); transportIn = new TransportInDescription("null"); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Sun Dec 17 22:34:08 2017 @@ -23,6 +23,7 @@ import org.apache.axiom.om.OMAbstractFac import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; import org.apache.axis2.receivers.AbstractInOutMessageReceiver; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; @@ -34,7 +35,6 @@ import org.apache.axis2.description.Axis import org.apache.axis2.description.InOutAxisOperation; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; import javax.xml.namespace.QName; @@ -59,7 +59,7 @@ public class EngineWithoutPhaseResolving configContext = new ConfigurationContext(engineRegistry); TransportOutDescription transport = new TransportOutDescription("null"); - transport.setSender(new CommonsHTTPTransportSender()); + transport.setSender(new HTTPClient4TransportSender()); TransportInDescription transportIn = new TransportInDescription("null"); AxisOperation axisOp = new InOutAxisOperation(operationName); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,8 @@ package org.apache.axis2.engine; -import java.io.ByteArrayInputStream; import java.io.File; +import java.io.StringReader; import java.util.List; import javax.xml.stream.XMLStreamException; @@ -30,11 +30,10 @@ import junit.framework.TestSuite; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.util.StAXUtils; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axiom.soap.SOAP12Constants; import org.apache.axiom.soap.SOAPEnvelope; -import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.client.OperationClient; @@ -147,10 +146,7 @@ public class FaultHandlingTest extends U " <m:echoIn xmlns:m=\"http://example.org/echo\"; /> \n" + " </env:Body>\n" + " </env:Envelope>"; - return (SOAPEnvelope)new StAXSOAPModelBuilder(StAXUtils.createXMLStreamReader( - new ByteArrayInputStream(soap.getBytes())), - SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI) - .getDocumentElement(); + return OMXMLBuilderFactory.createSOAPModelBuilder(new StringReader(soap)).getSOAPEnvelope(); } private SOAPEnvelope getResponse(SOAPEnvelope inEnvelope) throws AxisFault { @@ -198,8 +194,8 @@ public class FaultHandlingTest extends U sender.sendReceive(payload).toString(); } catch (AxisFault axisFault) { - assertTrue(axisFault.getFaultCodeElement().toString() - .indexOf(FaultHandler.M_FAULT_EXCEPTION) > -1); + assertEquals(FaultHandler.FAULT_EXCEPTION, axisFault.getFaultCode()); + assertEquals(FaultHandler.FAULT_EXCEPTION, axisFault.getFaultCodeElement().getValueAsQName()); assertTrue(axisFault.getFaultDetailElement().toString() .indexOf(FaultHandler.DETAIL_MORE_INFO) > -1); assertTrue(axisFault.getFaultReasonElement().toString() Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java Sun Dec 17 22:34:08 2017 @@ -20,7 +20,6 @@ package org.apache.axis2.engine; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.util.StAXUtils; import org.apache.axis2.AxisFault; import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.MessageContext; @@ -69,7 +68,7 @@ public class HandlerFailureTest extends ServiceClient sender = getClient(Echo.SERVICE_NAME, Echo.ECHO_OM_ELEMENT_OP_NAME); OMElement result = sender.sendReceive(TestingUtils.createDummyOMElement()); - result.serializeAndConsume(StAXUtils.createXMLStreamWriter(System.out)); + result.serializeAndConsume(System.out); fail("the test must fail due to the intentional failure of the \"culprit\" handler"); } catch (AxisFault e) { log.info(e.getMessage()); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java Sun Dec 17 22:34:08 2017 @@ -46,8 +46,8 @@ import org.apache.axis2.dispatchers.SOAP import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver; import org.apache.axis2.receivers.RawXMLINOutMessageReceiver; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; import org.apache.axis2.transport.http.SimpleHTTPServer; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -179,9 +179,9 @@ public class MessageContextSaveATest ext TransportOutDescription transportOut = new TransportOutDescription("null"); TransportOutDescription transportOut2 = new TransportOutDescription("happy"); TransportOutDescription transportOut3 = new TransportOutDescription("golucky"); - transportOut.setSender(new CommonsHTTPTransportSender()); - transportOut2.setSender(new CommonsHTTPTransportSender()); - transportOut3.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); + transportOut2.setSender(new HTTPClient4TransportSender()); + transportOut3.setSender(new HTTPClient4TransportSender()); axisConfiguration.addTransportOut(transportOut3); axisConfiguration.addTransportOut(transportOut2); axisConfiguration.addTransportOut(transportOut); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java Sun Dec 17 22:34:08 2017 @@ -46,8 +46,8 @@ import org.apache.axis2.dispatchers.SOAP import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver; import org.apache.axis2.receivers.RawXMLINOutMessageReceiver; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; import org.apache.axis2.transport.http.SimpleHTTPServer; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -294,9 +294,9 @@ public class MessageContextSaveBTest ext transportOut = new TransportOutDescription("null"); transportOut2 = new TransportOutDescription("happy"); transportOut3 = new TransportOutDescription("golucky"); - transportOut.setSender(new CommonsHTTPTransportSender()); - transportOut2.setSender(new CommonsHTTPTransportSender()); - transportOut3.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); + transportOut2.setSender(new HTTPClient4TransportSender()); + transportOut3.setSender(new HTTPClient4TransportSender()); axisConfiguration.addTransportOut(transportOut3); axisConfiguration.addTransportOut(transportOut2); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java Sun Dec 17 22:34:08 2017 @@ -45,8 +45,8 @@ import org.apache.axis2.dispatchers.SOAP import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver; import org.apache.axis2.receivers.RawXMLINOutMessageReceiver; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; import org.apache.axis2.transport.http.SimpleHTTPServer; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.axis2.util.MetaDataEntry; import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; @@ -260,9 +260,9 @@ public class MessageContextSaveCTest ext transportOut = new TransportOutDescription("null"); transportOut2 = new TransportOutDescription("happy"); transportOut3 = new TransportOutDescription("golucky"); - transportOut.setSender(new CommonsHTTPTransportSender()); - transportOut2.setSender(new CommonsHTTPTransportSender()); - transportOut3.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); + transportOut2.setSender(new HTTPClient4TransportSender()); + transportOut3.setSender(new HTTPClient4TransportSender()); saveAxisConfiguration.addTransportOut(transportOut3); saveAxisConfiguration.addTransportOut(transportOut2); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Sun Dec 17 22:34:08 2017 @@ -44,8 +44,8 @@ import org.apache.axis2.dispatchers.SOAP import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver; import org.apache.axis2.receivers.RawXMLINOutMessageReceiver; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; import org.apache.axis2.transport.http.SimpleHTTPServer; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -238,9 +238,9 @@ public class MessageContextSelfManagedDa transportOut = new TransportOutDescription("null"); transportOut2 = new TransportOutDescription("happy"); transportOut3 = new TransportOutDescription("golucky"); - transportOut.setSender(new CommonsHTTPTransportSender()); - transportOut2.setSender(new CommonsHTTPTransportSender()); - transportOut3.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); + transportOut2.setSender(new HTTPClient4TransportSender()); + transportOut3.setSender(new HTTPClient4TransportSender()); axisConfiguration.addTransportOut(transportOut3); axisConfiguration.addTransportOut(transportOut2); axisConfiguration.addTransportOut(transportOut); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java Sun Dec 17 22:34:08 2017 @@ -44,7 +44,7 @@ import org.apache.axis2.dispatchers.SOAP import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver; import org.apache.axis2.receivers.RawXMLINOutMessageReceiver; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -169,7 +169,7 @@ public class OperationContextSaveTest ex //----------------------------------------------------------------- transportOut = new TransportOutDescription("null"); - transportOut.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); transportIn = new TransportInDescription("null"); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java Sun Dec 17 22:34:08 2017 @@ -27,8 +27,8 @@ import org.apache.axis2.client.Options; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; -import org.apache.axis2.transport.http.CommonsHTTPTransportSender; import org.apache.axis2.transport.http.SimpleHTTPServer; +import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -97,9 +97,9 @@ public class OptionsSaveTest extends Tes TransportOutDescription transportOut = new TransportOutDescription("null"); TransportOutDescription transportOut2 = new TransportOutDescription("happy"); TransportOutDescription transportOut3 = new TransportOutDescription("golucky"); - transportOut.setSender(new CommonsHTTPTransportSender()); - transportOut2.setSender(new CommonsHTTPTransportSender()); - transportOut3.setSender(new CommonsHTTPTransportSender()); + transportOut.setSender(new HTTPClient4TransportSender()); + transportOut2.setSender(new HTTPClient4TransportSender()); + transportOut3.setSender(new HTTPClient4TransportSender()); options.setTransportOut(transportOut); axisConfiguration.addTransportOut(transportOut3); axisConfiguration.addTransportOut(transportOut2); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java Sun Dec 17 22:34:08 2017 @@ -21,42 +21,73 @@ package org.apache.axis2.engine; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.axis2.context.MessageContext; -import org.apache.axis2.context.ServiceContext; + +import org.apache.axiom.om.OMElement; +import org.apache.axis2.AxisFault; +import org.apache.axis2.Constants; +import org.apache.axis2.addressing.EndpointReference; +import org.apache.axis2.client.Options; +import org.apache.axis2.client.ServiceClient; import org.apache.axis2.description.AxisService; -import org.apache.axis2.engine.util.InvokerThread; import org.apache.axis2.engine.util.TestConstants; +import org.apache.axis2.integration.TestingUtils; import org.apache.axis2.integration.UtilServer; import org.apache.axis2.integration.UtilServerBasedTestCase; import org.apache.axis2.util.Utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.xml.namespace.QName; -import java.util.Calendar; -import java.util.GregorianCalendar; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; public class ThreadingTest extends UtilServerBasedTestCase implements TestConstants { - - private static final Log log = LogFactory.getLog(ThreadingTest.class); - protected QName transportName = new QName("http://localhost/my";, - "NullTransport"); + private static class Invoker implements Runnable { + private final int threadNumber; + private final CountDownLatch latch; + private Exception thrownException; + + Invoker(int threadNumber, CountDownLatch latch) throws AxisFault { + this.threadNumber = threadNumber; + this.latch = latch; + } - protected AxisConfiguration engineRegistry; - protected MessageContext mc; - protected ServiceContext serviceContext; - protected AxisService service; + @Override + public void run() { + try { + log.info("Starting Thread number " + threadNumber + " ............."); + OMElement payload = TestingUtils.createDummyOMElement(); + + Options options = new Options(); + options.setTo(new EndpointReference("http://127.0.0.1:"; + + UtilServer.TESTING_PORT + + "/axis2/services/EchoXMLService/echoOMElement")); + options.setTransportInProtocol(Constants.TRANSPORT_HTTP); + ServiceClient sender = new ServiceClient(); + sender.setOptions(options); + OMElement result = sender.sendReceive(payload); + + TestingUtils.compareWithCreatedOMElement(result); + log.info("Finishing Thread number " + threadNumber + " ....."); + } catch (Exception axisFault) { + thrownException = axisFault; + log.error("Error has occured invoking the service ", axisFault); + } + latch.countDown(); + } - protected boolean finish = false; + Exception getThrownException() { + return thrownException; + } + } public static Test suite() { return getTestSetup(new TestSuite(ThreadingTest.class)); } protected void setUp() throws Exception { - service = + AxisService service = Utils.createSimpleService(serviceName, Echo.class.getName(), operationName); @@ -69,41 +100,22 @@ public class ThreadingTest extends UtilS } public void testEchoXMLSync() throws Exception { - int numberOfThreads = 5; - InvokerThread[] invokerThreads = new InvokerThread[numberOfThreads]; + Invoker[] invokers = new Invoker[5]; + CountDownLatch latch = new CountDownLatch(invokers.length); - for (int i = 0; i < numberOfThreads; i++) { - InvokerThread invokerThread = new InvokerThread(i + 1); - invokerThreads[i] = invokerThread; - invokerThread.start(); + for (int i = 0; i < invokers.length; i++) { + Invoker invoker = new Invoker(i + 1, latch); + invokers[i] = invoker; + new Thread(invoker).start(); } - boolean threadsAreRunning; - Calendar cal = new GregorianCalendar(); - int min = cal.get(Calendar.MINUTE); - - do { - threadsAreRunning = false; - for (int i = 0; i < numberOfThreads; i++) { - if (invokerThreads[i].isAlive()) { - threadsAreRunning = true; - break; - } - Exception exception = invokerThreads[i].getThrownException(); - if (exception != null) { - throw new Exception("Exception thrown in thread " + i + " ....", exception); - } - } + latch.await(30, TimeUnit.SECONDS); - // waiting 3 seconds, if not finish, time out. - if (Math.abs(min - new GregorianCalendar().get(Calendar.MINUTE)) > 1) { - log.info("I'm timing out. Can't wait more than this to finish."); - fail("Timing out"); + for (Invoker invoker : invokers) { + Exception exception = invoker.getThrownException(); + if (exception != null) { + throw exception; } - - Thread.sleep(100); - } while (threadsAreRunning); - - assertTrue(true); + } } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -81,11 +81,11 @@ <!-- ================================================= --> <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</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> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -55,7 +55,7 @@ <!-- Transport Outs --> <!-- ================================================= --> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" 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/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Sun Dec 17 22:34:08 2017 @@ -58,7 +58,7 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> - <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java Sun Dec 17 22:34:08 2017 @@ -127,6 +127,7 @@ public class MapServiceTest extends Test OMFactory fac = OMAbstractFactory.getOMFactory(); OMElement map = AXIOMUtil .stringToOM("<map><entry><key>key1</key><value>value1</value></entry></map>"); + map.build(); OMNamespace omNs = fac.createOMNamespace( "http://map.engine.axis2.apache.org";, "map"); OMElement msg = fac.createOMElement(opName, omNs); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/util/FaultHandler.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/util/FaultHandler.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/util/FaultHandler.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/engine/util/FaultHandler.java Sun Dec 17 22:34:08 2017 @@ -27,7 +27,6 @@ import org.apache.axiom.soap.SOAPFaultCo import org.apache.axiom.soap.SOAPFaultDetail; import org.apache.axiom.soap.SOAPFaultReason; import org.apache.axiom.soap.SOAPFaultText; -import org.apache.axiom.soap.SOAPFaultValue; import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.handlers.AbstractHandler; @@ -39,7 +38,8 @@ public class FaultHandler extends Abstra "This is a test fault message which happened suddenly"; public static final String DETAIL_MORE_INFO = "This error is a result due to a fake problem in Axis2 engine. Do not worry ;)"; - public static final String M_FAULT_EXCEPTION = "m:FaultException"; + public static final QName FAULT_EXCEPTION = new QName("http://someuri.org";, "FaultException", "m"); + public static final String M_FAULT_EXCEPTION = FAULT_EXCEPTION.getPrefix() + ":" + FAULT_EXCEPTION.getLocalPart(); public static final String ERR_HANDLING_WITH_MSG_CTXT = "ErrorHandlingWithParamsSetToMsgCtxt"; public static final String ERR_HANDLING_WITH_AXIS_FAULT = @@ -60,13 +60,7 @@ public class FaultHandler extends Abstra if (ERR_HANDLING_WITH_MSG_CTXT.equals(firstElement.getLocalName())) { SOAPFaultCode soapFaultCode = soapFac.createSOAPFaultCode(); - soapFaultCode.declareNamespace("http://someuri.org";, "m"); - if (msgContext.isSOAP11()) { - soapFaultCode.setText(M_FAULT_EXCEPTION); - } else { - SOAPFaultValue soapFaultValue = soapFac.createSOAPFaultValue(soapFaultCode); - soapFaultValue.setText(M_FAULT_EXCEPTION); - } + soapFaultCode.setValue(FAULT_EXCEPTION); SOAPFaultReason soapFaultReason = soapFac.createSOAPFaultReason(); @@ -88,8 +82,7 @@ public class FaultHandler extends Abstra throw new AxisFault("A dummy exception has occurred"); } else if (ERR_HANDLING_WITH_AXIS_FAULT.equals(firstElement.getLocalName())) { - throw new AxisFault(new QName(M_FAULT_EXCEPTION), FAULT_REASON, null, null, - detailEntry); + throw new AxisFault(FAULT_EXCEPTION, FAULT_REASON, null, null, detailEntry); } return InvocationResponse.CONTINUE; } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericService.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericService.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericService.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericService.java Sun Dec 17 22:34:08 2017 @@ -40,7 +40,10 @@ public class GenericService { return persons.get(0); } +// See generics.wsdl +/* public void processStringArray(List<String[]> values) { } +*/ } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java Sun Dec 17 22:34:08 2017 @@ -39,6 +39,7 @@ public class GenericWSDLGenerationTest public void test1() throws Exception { XMLUnit.setIgnoreWhitespace(true); + XMLUnit.setIgnoreComments(true); try { ByteArrayOutputStream out = new ByteArrayOutputStream(); Java2WSDLBuilder builder = new Java2WSDLBuilder(out, GenericService.class.getName(), GenericService.class.getClassLoader()); @@ -52,6 +53,7 @@ public class GenericWSDLGenerationTest fail(myDiff.toString()); } finally { XMLUnit.setIgnoreWhitespace(false); + XMLUnit.setIgnoreComments(false); } } } \ No newline at end of file Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Sun Dec 17 22:34:08 2017 @@ -103,7 +103,7 @@ public class EchoRawMTOMToBase64Test ext return rpcWrapEle; } - public void testEchoXMLASync() throws Exception { + public void _testEchoXMLASync() throws Exception { OMElement payload = createPayload(); Options clientOptions = new Options(); clientOptions.setTo(targetEPR); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/om/OMAttributeTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/om/OMAttributeTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/om/OMAttributeTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/om/OMAttributeTest.java Sun Dec 17 22:34:08 2017 @@ -20,10 +20,10 @@ package org.apache.axis2.om; import junit.framework.TestCase; -import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.axis2.util.StreamWrapper; import za.co.eskom.nrs.xmlvend.base.x20.schema.AdviceReqDocument; import za.co.eskom.nrs.xmlvend.base.x20.schema.ConfirmationAdviceReq; @@ -48,10 +48,8 @@ public class OMAttributeTest extends Tes doc.setAdviceReq(req); //get the pull parser and construct the OMElement - StAXOMBuilder builder = new StAXOMBuilder( - OMAbstractFactory.getOMFactory(), - new StreamWrapper(doc.newXMLStreamReader()) - ); + OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder( + new StreamWrapper(doc.newXMLStreamReader())); OMElement elt = builder.getDocumentElement(); //traverse the element and look at the namespace of the attribute Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rest/RESTfulServiceTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rest/RESTfulServiceTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rest/RESTfulServiceTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rest/RESTfulServiceTest.java Sun Dec 17 22:34:08 2017 @@ -23,7 +23,6 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.util.AXIOMUtil; -import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; @@ -59,7 +58,7 @@ public class RESTfulServiceTest extends createConfigurationContextFromFileSystem(null, null); } - public void testServiceCreate() throws AxisFault { + public void test() throws Exception { AxisConfiguration axisConfig = configContext.getAxisConfiguration(); AxisService axisService = AxisService.createService("org.apache.axis2.rest.StockService", axisConfig); @@ -133,10 +132,6 @@ public class RESTfulServiceTest extends axisConfig.addService(axisService); assertEquals("StockService", axisService.getName()); - } - - public void testRESTMethods() throws AxisFault { - HttpClient httpClient = new HttpClient(); String url1 = "http://127.0.0.1:"; + (UtilServer.TESTING_PORT) @@ -153,10 +148,6 @@ public class RESTfulServiceTest extends OMElement returnElem = response.getFirstChildWithName(new QName("return")); assertEquals("IBM stock added with value : 34.7", returnElem.getText()); - } catch (Exception e) { - System.err.println("Error occurred while trying to invoke method: " + e.getMessage()); - e.printStackTrace(); - fail("Caught exception " + e.toString()); } finally { method1.releaseConnection(); } @@ -176,10 +167,6 @@ public class RESTfulServiceTest extends OMElement returnElem = response.getFirstChildWithName(new QName("return")); assertEquals("34.7", returnElem.getText()); - } catch (Exception e) { - System.err.println("Error occurred while trying to invoke method: " + e.getMessage()); - e.printStackTrace(); - fail("Caught exception " + e.toString()); } finally { method2.releaseConnection(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Sun Dec 17 22:34:08 2017 @@ -23,8 +23,8 @@ import org.apache.axiom.om.OMAbstractFac import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.axiom.om.util.StAXUtils; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; @@ -37,10 +37,7 @@ import org.apache.axis2.integration.RPCL import org.apache.axis2.rpc.client.RPCServiceClient; import org.apache.axis2.wsdl.WSDLConstants; -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import java.io.ByteArrayInputStream; +import java.io.StringReader; import java.util.ArrayList; public class MultirefTest extends RPCLocalTestCase { @@ -389,11 +386,7 @@ public class MultirefTest extends RPCLoc } private OMElement getOMElement(String str, OMFactory fac) throws Exception { - StAXOMBuilder staxOMBuilder; - XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new - ByteArrayInputStream(str.getBytes())); - staxOMBuilder = new StAXOMBuilder(fac, xmlReader); - return staxOMBuilder.getDocumentElement(); + return OMXMLBuilderFactory.createOMBuilder(fac, new StringReader(str)).getDocumentElement(); } @@ -472,17 +465,7 @@ public class MultirefTest extends RPCLoc " <item0>ghi</item0>\n" + " <item0>klm</item0>\n" + "</reference>"; - StAXOMBuilder staxOMBuilder; - try { - XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new - ByteArrayInputStream(str.getBytes())); - staxOMBuilder = new - StAXOMBuilder(fac, xmlReader); - } catch (XMLStreamException e) { - throw AxisFault.makeFault(e); - } catch (FactoryConfigurationError factoryConfigurationError) { - throw AxisFault.makeFault(factoryConfigurationError); - } + OMXMLParserWrapper staxOMBuilder = OMXMLBuilderFactory.createOMBuilder(fac, new StringReader(str)); envelope.getBody().addChild(staxOMBuilder.getDocumentElement()); MessageContext reqMessageContext = new MessageContext(); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Sun Dec 17 22:34:08 2017 @@ -19,11 +19,8 @@ package org.apache.axis2.rpc; -import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.axiom.om.util.StAXUtils; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axis2.AxisFault; import org.apache.axis2.databinding.utils.BeanUtil; import org.apache.axis2.databinding.utils.ConverterUtil; @@ -32,13 +29,10 @@ import org.apache.axis2.integration.RPCL import org.apache.axis2.rpc.client.RPCServiceClient; import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamReader; -import java.io.ByteArrayInputStream; +import java.io.StringReader; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; -import java.util.TimeZone; public class RPCCallTest extends RPCLocalTestCase { @@ -455,14 +449,9 @@ public class RPCCallTest extends RPCLoca " <arg0><abc>vaue3</abc></arg0>\n" + " <arg0><abc>vaue4</abc></arg0>\n" + "</req:omElementArray>"; - StAXOMBuilder staxOMBuilder; - XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new - ByteArrayInputStream(str.getBytes())); - OMFactory fac = OMAbstractFactory.getOMFactory(); - - staxOMBuilder = new StAXOMBuilder(fac, xmlReader); - - OMElement elem = sender.sendReceive(staxOMBuilder.getDocumentElement()); + OMElement elem = sender.sendReceive( + OMXMLBuilderFactory.createOMBuilder( + new StringReader(str)).getDocumentElement()); assertEquals("4", elem.getFirstElement().getText()); } @@ -474,13 +463,7 @@ public class RPCCallTest extends RPCLoca " <item0 xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"; xsi:type=\"xsd:string\">klm</item0>\n" + " <arg1 xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"; xsi:type=\"xsd:int\">10</arg1>" + "</req:handleArrayList>"; - StAXOMBuilder staxOMBuilder; - XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader( - new ByteArrayInputStream(str.getBytes())); - OMFactory fac = OMAbstractFactory.getOMFactory(); - - staxOMBuilder = new StAXOMBuilder(fac, xmlReader); - return staxOMBuilder.getDocumentElement(); + return OMXMLBuilderFactory.createOMBuilder(new StringReader(str)).getDocumentElement(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>axis2-java2wsdl</artifactId> <name>Apache Axis2 - Java2WSDL</name> @@ -46,10 +46,6 @@ <artifactId>axis2-transport-local</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> <!-- external JARs --> <dependency> <groupId>commons-logging</groupId> @@ -62,10 +58,6 @@ <artifactId>xmlschema-core</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </dependency> - <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <scope>test</scope> @@ -101,6 +93,11 @@ <artifactId>jaxws-rt</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <url>http://axis.apache.org/axis2/java/core/</url> <scm> @@ -184,8 +181,8 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <phase>test</phase> @@ -193,25 +190,27 @@ <goal>execute</goal> </goals> <configuration> - <source> - import groovy.xml.* - - if (project.properties['maven.test.skip']) { - println 'Tests are skipped' - return - } - - def parser = new XmlParser() - def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/') - def xs = new Namespace('http://www.w3.org/2001/XMLSchema') - - println 'Checking p2n.wsdl' - - def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/p2n.wsdl")) - def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace' - assert namespaces.contains('http://www.example.org/calculator') - assert namespaces.contains('http://www.example.org/calculator-service') - </source> + <scripts> + <script> + import groovy.xml.* + + if (System.properties['maven.test.skip']) { + println 'Tests are skipped' + return + } + + def parser = new XmlParser() + def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/') + def xs = new Namespace('http://www.w3.org/2001/XMLSchema') + + println 'Checking p2n.wsdl' + + def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/p2n.wsdl")) + def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace' + assert namespaces.contains('http://www.example.org/calculator') + assert namespaces.contains('http://www.example.org/calculator-service') + </script> + </scripts> </configuration> </execution> </executions> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java Sun Dec 17 22:34:08 2017 @@ -121,7 +121,7 @@ public class Java2WSDLCodegenEngine impl if (Java2WSDLUtils.isURL(classPathEntry)) { urls[i] = new URL(classPathEntry); } else { - urls[i] = new File(classPathEntry).toURL(); + urls[i] = new File(classPathEntry).toURI().toURL(); } } } catch (MalformedURLException e) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/test/org/apache/axis2/description/Java2WSDLTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/test/org/apache/axis2/description/Java2WSDLTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/test/org/apache/axis2/description/Java2WSDLTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/test/org/apache/axis2/description/Java2WSDLTest.java Sun Dec 17 22:34:08 2017 @@ -17,27 +17,29 @@ * under the License. */ -package org.apache.axis2.description; - -import junit.framework.TestCase; -import org.apache.ws.java2wsdl.Java2WSDLBuilder; -import org.xml.sax.InputSource; - -import javax.wsdl.Definition; -import javax.wsdl.xml.WSDLReader; -import javax.wsdl.factory.WSDLFactory; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.HashMap; +package org.apache.axis2.description; + +import junit.framework.TestCase; + +import org.apache.axis2.wsdl.WSDLUtil; +import org.apache.ws.java2wsdl.Java2WSDLBuilder; +import org.xml.sax.InputSource; + +import javax.wsdl.Definition; +import javax.wsdl.xml.WSDLReader; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.HashMap; public class Java2WSDLTest extends TestCase { public void test1() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); - Java2WSDLBuilder builder = new Java2WSDLBuilder(out, CalculatorService.class.getName(), CalculatorService.class.getClassLoader(), new HashMap()); - builder.generateWSDL(); - InputSource inputSource = new InputSource(new ByteArrayInputStream(out.toByteArray())); - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - Definition definition = wsdlReader.readWSDL(null, inputSource); - assertNotNull(definition); - } + Java2WSDLBuilder builder = new Java2WSDLBuilder(out, CalculatorService.class.getName(), CalculatorService.class.getClassLoader(), new HashMap()); + builder.generateWSDL(); + InputSource inputSource = new InputSource(new ByteArrayInputStream(out.toByteArray())); + WSDLReader wsdlReader = WSDLUtil.newWSDLReaderWithPopulatedExtensionRegistry(); + Definition definition = wsdlReader.readWSDL(null, inputSource); + assertNotNull(definition); + } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>axis2-jaxbri</artifactId> <name>Apache Axis2 - JAXB-RI Data Binding</name> @@ -37,10 +37,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-jaxb</artifactId> - </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> <version>${project.version}</version> @@ -63,19 +59,13 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis2-testutils</artifactId> - <version>${project.version}</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-testutils</artifactId> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -103,44 +93,26 @@ </executions> </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> <executions> <execution> - <id>gen-ts</id> - <phase>generate-test-sources</phase> <goals> - <goal>run</goal> + <goal>testXjc</goal> </goals> <configuration> - <tasks unless="maven.test.skip"> - <!-- Theres got to be a better way to do this --> - <property name="schema.source.dir" value="src/test/xsd" /> - <property name="schema.output.base.dir" value="target/schema" /> - <property name="schema.generated.src.dir" value="${schema.output.base.dir}/src" /> - <property name="schema.generated.classes.dir" value="${schema.output.base.dir}/classes" /> - <!-- make the dirs --> - <mkdir dir="${schema.output.base.dir}" /> - <mkdir dir="${schema.generated.src.dir}" /> - <mkdir dir="${schema.generated.classes.dir}" /> - <!-- Run JAXB schema compiler with designated schemas --> - <echo>Generating JAX-B classes for DocLitBareService test</echo> - <java classname="com.sun.tools.xjc.Driver" fork="true"> - <classpath refid="maven.runtime.classpath" /> - <classpath location="${compiled.classes.dir}" /> - <arg line="-d ${schema.generated.src.dir} -quiet -wsdl src/test/wsdl/DocLitBareService.wsdl" /> - </java> - </tasks> + <sourceType>WSDL</sourceType> + <testSources> + <testSource>src/test/wsdl/DocLitBareService.wsdl</testSource> + </testSources> </configuration> </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> <execution> <id>wsdl2java</id> <phase>generate-test-sources</phase> @@ -151,27 +123,11 @@ <tasks unless="maven.test.skip"> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> <classpath refid="maven.test.classpath" /> - <arg line="-d jaxbri -ss -ssi -sd -o ${project.build.directory}/gen/Test01 -u -uri src/test/wsdl/Test01.wsdl" /> + <arg line="-d jaxbri -ss -ssi -sd -o '${project.build.directory}/gen/Test01' -u -uri src/test/wsdl/Test01.wsdl" /> </java> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> <classpath refid="maven.test.classpath" /> - <arg line="-d jaxbri -o ${project.build.directory}/gen/Test01 -u -uri src/test/wsdl/Test01.wsdl" /> - </java> - <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <classpath refid="maven.test.classpath" /> - <arg line="-d jaxbri -ss -ssi -sd -o ${project.build.directory}/gen/processor -u -uri src/test/wsdl/processor.wsdl -ns2p http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.service"; /> - </java> - <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <classpath refid="maven.test.classpath" /> - <arg line="-d jaxbri -o ${project.build.directory}/gen/processor -u -uri src/test/wsdl/processor.wsdl -ns2p http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.client"; /> - </java> - <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <classpath refid="maven.test.classpath" /> - <arg line="-d jaxbri -ss -ssi -sd -g -o ${project.build.directory}/gen/identityservice -u -uri src/test/wsdl/identityService.wsdl -p org.apache.axis2.jaxbri.identityservice -ns2p http://www.example.org/identity=org.apache.axis2.jaxbri.identityservice"; /> - </java> - <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <classpath refid="maven.test.classpath" /> - <arg line="-d jaxbri -ss -ssi -sd -g -o ${project.build.directory}/gen/mtom -u -uri src/test/wsdl/mtom.wsdl -p org.apache.axis2.jaxbri.mtom -ns2p http://www.example.org/mtom/=org.apache.axis2.jaxbri.mtom -EbindingFileName " /> + <arg line="-d jaxbri -o '${project.build.directory}/gen/Test01' -u -uri src/test/wsdl/Test01.wsdl" /> </java> </tasks> </configuration> @@ -191,109 +147,6 @@ </configuration> </execution> </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>process-test-resources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/schema/src</source> - <source>${project.build.directory}/gen/Test01/src</source> - <source>${project.build.directory}/gen/processor/src</source> - <source>${project.build.directory}/gen/identityservice/src</source> - <source>${project.build.directory}/gen/mtom/src</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>Test01-repo</id> - <phase>generate-test-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/repo/Test01</outputDirectory> - <resources> - <resource> - <directory>src/test/repo</directory> - </resource> - <resource> - <directory>${project.build.directory}/gen/Test01/resources</directory> - <targetPath>services/Test01.aar/META-INF</targetPath> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>processor-repo</id> - <phase>generate-test-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/repo/processor</outputDirectory> - <resources> - <resource> - <directory>src/test/repo</directory> - </resource> - <resource> - <directory>${project.build.directory}/gen/processor/resources</directory> - <targetPath>services/processor.aar/META-INF</targetPath> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>identityservice-repo</id> - <phase>generate-test-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/repo/identityservice</outputDirectory> - <resources> - <resource> - <directory>src/test/repo</directory> - </resource> - <resource> - <directory>${project.build.directory}/gen/identityservice/resources</directory> - <targetPath>services/identityservice.aar/META-INF</targetPath> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>mtom-repo</id> - <phase>generate-test-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/repo/mtom</outputDirectory> - <resources> - <resource> - <directory>src/test/repo</directory> - </resource> - <resource> - <directory>${project.build.directory}/gen/mtom/resources</directory> - <targetPath>services/mtom.aar/META-INF</targetPath> - </resource> - </resources> - </configuration> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java Sun Dec 17 22:34:08 2017 @@ -249,7 +249,7 @@ public class CodeGenerationUtility { // Emit the code artifacts JCodeModel codeModel = jaxbModel.generateCode(null, null); - FileCodeWriter writer = new FileCodeWriter(outputDir); + FileCodeWriter writer = new FileCodeWriter(outputDir, cgconfig.getOutputEncoding()); codeModel.build(writer); Collection mappings = jaxbModel.getMappings(); @@ -359,7 +359,7 @@ public class CodeGenerationUtility { private static void scanEpisodeFile(File jar, SchemaCompiler sc) throws BadCommandLineException, IOException { - URLClassLoader ucl = new URLClassLoader(new URL[]{jar.toURL()}); + URLClassLoader ucl = new URLClassLoader(new URL[]{jar.toURI().toURL()}); Enumeration<URL> resources = ucl.findResources("META-INF/sun-jaxb.episode"); while (resources.hasMoreElements()) { URL url = resources.nextElement(); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl Sun Dec 17 22:34:08 2017 @@ -208,11 +208,7 @@ org.apache.axiom.om.OMElement param, java.lang.Class type) throws org.apache.axis2.AxisFault{ try { - javax.xml.bind.JAXBContext context = wsContext; - javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller(); - org.apache.axiom.util.jaxb.UnmarshallerAdapter adapter = org.apache.axiom.util.jaxb.JAXBUtils.getUnmarshallerAdapter(param.getXMLStreamReaderWithoutCaching()); - unmarshaller.setAttachmentUnmarshaller(adapter.getAttachmentUnmarshaller()); - return unmarshaller.unmarshal(adapter.getReader(), type).getValue(); + return param.unmarshal(wsContext, null, type, false).getValue(); } catch (javax.xml.bind.JAXBException bex){ throw org.apache.axis2.AxisFault.makeFault(bex); }
