Author: heiko.braun(a)jboss.com Date: 2007-01-08 10:16:09 -0500 (Mon, 08 Jan 2007) New Revision: 1863 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java Log: Pivot processing bug: Fix retail sample Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-08 13:32:01 UTC (rev 1862) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-08 15:16:09 UTC (rev 1863) @@ -165,11 +165,17 @@ protected CommonMessageContext processPivot(CommonMessageContext requestContext) { log.debug("Begin response processing"); - + + // remove existing context + MessageContextAssociation.popMessageContext(); + SOAPMessageContextJAXWS responseContext = new SOAPMessageContextJAXWS(requestContext); responseContext.setSOAPMessage(null); responseContext.clear(); // clear message context properties + + // associate new context MessageContextAssociation.pushMessageContext(responseContext); + return responseContext; } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java 2007-01-08 13:32:01 UTC (rev 1862) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java 2007-01-08 15:16:09 UTC (rev 1863) @@ -21,10 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.retail; +import javax.ejb.Remote; import javax.jws.WebMethod; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import javax.ejb.Remote; @Remote @WebService(name = "OrderMgmt", targetNamespace = "http://org.jboss.ws/samples/retail") Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-01-08 13:32:01 UTC (rev 1862) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-01-08 15:16:09 UTC (rev 1863) @@ -24,8 +24,6 @@ import org.jboss.logging.Logger; import org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification; import org.jboss.test.ws.jaxws.samples.retail.cc.CCVerificationService; -import org.jboss.test.ws.jaxws.samples.retail.cc.VerificationRequest; -import org.jboss.test.ws.jaxws.samples.retail.cc.VerificationResponse; import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountRequest; import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountResponse; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt; @@ -35,8 +33,8 @@ import javax.ejb.Stateless; import javax.jws.HandlerChain; import javax.jws.WebService; -import javax.xml.ws.WebServiceRef; import javax.xml.ws.Response; +import javax.xml.ws.WebServiceRef; /** * An example order management component Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java 2007-01-08 13:32:01 UTC (rev 1862) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java 2007-01-08 15:16:09 UTC (rev 1863) @@ -33,9 +33,7 @@ */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "orderStatus", propOrder = { - "status", "orderNum", "discount" - }) +@XmlType(name = "orderStatus", namespace = "http://org.jboss.ws/samples/retail") public class OrderStatus implements Serializable { private String status; private long orderNum;