Author: heiko.braun(a)jboss.com Date: 2007-05-16 10:57:48 -0400 (Wed, 16 May 2007) New Revision: 3110 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageMarshaller.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxws.xml branches/jbossws-2.0/jbossws-tests/build.xml branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java Log: Fix JBWS-1579 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-16 14:57:48 UTC (rev 3110) @@ -255,6 +255,9 @@ // metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true"); // since 2.0.0.GA metadata.put("NoThrowOnError", "true"); + // Chunked transfer encoding + metadata.put("chunkedLength", "1024"); + if (reqMessage != null) { populateHeaders(reqMessage, metadata); Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageMarshaller.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageMarshaller.java 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageMarshaller.java 2007-05-16 14:57:48 UTC (rev 3110) @@ -21,17 +21,15 @@ */ package org.jboss.ws.core.soap; -import java.io.IOException; -import java.io.OutputStream; - -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; - import org.jboss.logging.Logger; import org.jboss.remoting.InvocationRequest; import org.jboss.remoting.invocation.OnewayInvocation; import org.jboss.remoting.marshal.Marshaller; +import javax.xml.soap.SOAPMessage; +import java.io.IOException; +import java.io.OutputStream; + /** * @author Thomas.Diesler(a)jboss.org * @since 25-Nov-2004 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-05-16 14:57:48 UTC (rev 3110) @@ -23,40 +23,29 @@ //$Id$ -import java.io.IOException; -import java.net.URL; -import java.util.*; - -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingType; - import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; +import org.jboss.ws.metadata.umdm.*; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.wsdl.WSDLBinding; -import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLInterface; -import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.*; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import javax.jws.soap.SOAPBinding; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingType; +import java.io.IOException; +import java.net.URL; +import java.util.Iterator; + /** * A client side meta data builder. * @@ -269,6 +258,7 @@ processSOAPBinding(epMetaData, wsClass); // process config, this will as well setup the handler + processEndpointConfig(epMetaData, wsClass); epMetaData.initEndpointConfig(); // Process an optional @HandlerChain annotation @@ -293,4 +283,18 @@ if(log.isDebugEnabled()) log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData()); } + + /** + * Process config contribution through service endpoint interfaces + * @param epMetaData + * @param wsClass - the service endpoint interface + */ + private void processEndpointConfig(EndpointMetaData epMetaData, Class<?> wsClass) + { + if (wsClass.isAnnotationPresent(EndpointConfig.class)) + { + EndpointConfig anConfig = wsClass.getAnnotation(EndpointConfig.class); + epMetaData.setConfigName(anConfig.configName(), anConfig.configFile()); + } + } } Modified: branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-05-16 14:57:48 UTC (rev 3110) @@ -139,6 +139,12 @@ </webinf> </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar"> + <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF"> + <include name="*.xml"/> + </metainf> + </jar> + <!-- jaxws-handlerscope --> <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/jbossws-2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/build.xml 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-tests/build.xml 2007-05-16 14:57:48 UTC (rev 3110) @@ -253,7 +253,7 @@ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true"/> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-05-16 14:57:48 UTC (rev 3110) @@ -62,7 +62,7 @@ public void testLargeFile() throws Exception { - long size = 6L * 1024L * 1024L; + long size = 6L * 1024L * 1024L * 1024L; // approx 600mb String methodName = "sendLargeFile"; SOAPMessage msg = setupMimeMessage(methodName); Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-16 13:29:33 UTC (rev 3109) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-16 14:57:48 UTC (rev 3110) @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -51,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war"); + return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war, jaxws-handlerlifecycle-client.jar"); } public void setUp() throws Exception @@ -85,25 +86,43 @@ * All handlers return true */ public void testHandleMessageTrue() throws Exception - { - System.out.println("FIXME: [JBWS-1579] @EndpointConfig ignored on SEI"); - + { String testResponse = port.runTest(getName()); String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:PostConstruct"); + expMessages.add("PreClientHandler2:PostConstruct"); expMessages.add("ClientHandler1:PostConstruct"); expMessages.add("ClientHandler2:PostConstruct"); expMessages.add("ClientHandler3:PostConstruct"); + expMessages.add("PostClientHandler1:PostConstruct"); + expMessages.add("PostClientHandler2:PostConstruct"); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound"); expMessages.add("ClientHandler1:Message:InBound"); + expMessages.add("PreClientHandler2:Message:InBound"); + expMessages.add("PreClientHandler1:Message:InBound"); + + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -159,10 +178,18 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound:false"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -172,6 +199,20 @@ assertNull(testResponse); } + private void dumpTracker(String trackerMessages) + { + StringTokenizer tok = new StringTokenizer(trackerMessages, ","); + while(tok.hasMoreTokens()) + { + System.out.print("expMessages.add(\""); + String s = tok.nextToken().trim(); + if(s.startsWith("[")) s = s.substring(1); + if(s.endsWith("]")) s = s.substring(0, s.length()-1); + System.out.print(s); + System.out.print("\");\n"); + } + } + /** * ClientHandler2 throws a RuntimeException on outbound */ @@ -190,11 +231,25 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound:ErrorInClientHandler2"); + + expMessages.add("PostClientHandler2:Fault:InBound"); + expMessages.add("PostClientHandler1:Fault:InBound"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -224,19 +279,34 @@ expMessages.add("ServerHandler3:Close"); expMessages.add("PostServerHandler1:Close"); expMessages.add("PostServerHandler2:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound"); expMessages.add("ClientHandler1:Message:InBound"); + expMessages.add("PreClientHandler2:Message:InBound"); + expMessages.add("PreClientHandler1:Message:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals("testServerHandler2Response", testResponse); @@ -271,19 +341,34 @@ expMessages.add("ServerHandler3:Close"); expMessages.add("PostServerHandler1:Close"); expMessages.add("PostServerHandler2:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Fault:InBound"); expMessages.add("ClientHandler2:Fault:InBound"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals("ErrorInServerHandler2", testResponse); @@ -320,15 +405,29 @@ trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound"); expMessages.add("ClientHandler1:Message:InBound"); + expMessages.add("PreClientHandler2:Message:InBound"); + expMessages.add("PreClientHandler1:Message:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals(getName() + "Response", testResponse); @@ -377,15 +476,29 @@ trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Fault:InBound"); expMessages.add("ClientHandler2:Fault:InBound"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals("ErrorInServerHandler2", testResponse); @@ -400,14 +513,26 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound:false"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -456,15 +581,29 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound:ErrorInClientHandler2"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages();