Author: thomas.diesler(a)jboss.com Date: 2007-01-04 09:29:49 -0500 (Thu, 04 Jan 2007) New Revision: 1784 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/SOAPMessageContextJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java Log: Fix tests for jbossas-4.0 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-01-04 12:46:32 UTC (rev 1783) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-01-04 14:29:49 UTC (rev 1784) @@ -56,6 +56,19 @@ // The map of the properties protected Map<String, Object> props = new HashMap<String, Object>(); + public CommonMessageContext() + { + } + + // Copy constructor + public CommonMessageContext(CommonMessageContext msgContext) + { + this.epMetaData = msgContext.epMetaData; + this.opMetaData = msgContext.opMetaData; + this.soapMessage = msgContext.soapMessage; + this.props = msgContext.props; + } + public EndpointMetaData getEndpointMetaData() { if (epMetaData == null && opMetaData != null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2007-01-04 12:46:32 UTC (rev 1783) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2007-01-04 14:29:49 UTC (rev 1784) @@ -51,19 +51,26 @@ public static final String SERVLET_RESPONSE = "javax.xml.ws.servlet.response"; public static final String SERVLET_SESSION = "javax.xml.ws.servlet.session"; - // The SOAP message - private SOAPMessage message; // The serialization context for this message ctx private SerializationContext serContext; + public MessageContextJAXRPC() + { + } + + public MessageContextJAXRPC(CommonMessageContext msgContext) + { + super(msgContext); + } + public SOAPMessage getMessage() { - return message; + return getSOAPMessage(); } public void setMessage(SOAPMessage message) { - this.message = message; + setSOAPMessage(message); } /** Get or create the serialization context Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/SOAPMessageContextJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/SOAPMessageContextJAXRPC.java 2007-01-04 12:46:32 UTC (rev 1783) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/SOAPMessageContextJAXRPC.java 2007-01-04 14:29:49 UTC (rev 1784) @@ -24,8 +24,9 @@ // $Id$ import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; +import org.jboss.ws.core.CommonMessageContext; + /** * Provides access to the SOAP message for either RPC request or response. * @@ -40,26 +41,11 @@ { } - /** Gets the SOAPMessage from this message context - * - * @return Returns the SOAPMessage; returns null if no SOAPMessage is present in this message context - */ - public SOAPMessage getMessage() + public SOAPMessageContextJAXRPC(CommonMessageContext msgContext) { - return getSOAPMessage(); + super(msgContext); } - /** Sets the SOAPMessage in this message context - * - * @param message SOAP message - * @throws javax.xml.rpc.JAXRPCException If any error during the setting of the SOAPMessage in this message context - * @throws UnsupportedOperationException - If this operation is not supported - */ - public void setMessage(SOAPMessage message) - { - setSOAPMessage(message); - } - /** * Gets the SOAP actor roles associated with an execution of the HandlerChain and its contained Handler instances. * Note that SOAP actor roles apply to the SOAP node and are managed using HandlerChain.setRoles and HandlerChain.getRoles. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2007-01-04 12:46:32 UTC (rev 1783) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2007-01-04 14:29:49 UTC (rev 1784) @@ -54,6 +54,15 @@ // The map of property scopes private HashMap<String, Scope> scopes = new HashMap<String, Scope>(); + public MessageContextJAXWS() + { + } + + public MessageContextJAXWS(CommonMessageContext msgContext) + { + super(msgContext); + } + /** Get or create the serialization context */ public SerializationContext getSerializationContext() Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java 2007-01-04 12:46:32 UTC (rev 1783) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java 2007-01-04 14:29:49 UTC (rev 1784) @@ -39,6 +39,8 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.soap.SOAPMessageContext; +import org.jboss.ws.core.CommonMessageContext; + /** * The interface SOAPMessageContext provides access to the SOAP message for either RPC request or response. * The javax.xml.soap.SOAPMessage specifies the standard Java API for the representation of a SOAP 1.1 message with attachments. @@ -56,6 +58,11 @@ { } + public SOAPMessageContextJAXWS(CommonMessageContext msgContext) + { + super(msgContext); + } + /** * Gets the SOAPMessage from this message context. * Modifications to the returned SOAPMessage change the message in-place, there is no need to susequently call setMessage. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-01-04 12:46:32 UTC (rev 1783) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-01-04 14:29:49 UTC (rev 1784) @@ -38,7 +38,6 @@ public abstract class HttpServer { public static String HTTP_SERVER_PROPERTY = HttpServer.class.getName(); - public static String DEFAULT_HTTP_SERVER_PROPERTY = "org.jboss.ws.integration.jboss.JBossHttpServer"; private Map<String, Object> properties = new HashMap<String, Object>(); @@ -53,7 +52,7 @@ */ public static HttpServer create() { - HttpServer server = (HttpServer)FactoryLoader.loadFactory(HTTP_SERVER_PROPERTY, DEFAULT_HTTP_SERVER_PROPERTY); + HttpServer server = (HttpServer)FactoryLoader.loadFactory(HTTP_SERVER_PROPERTY, null); return server; }