svn commit: r690464 - in /geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf: CXFEndpoint.java GeronimoDestination.java

[ga...@apache.org]

Author: gawor
Date: Fri Aug 29 22:18:08 2008
New Revision: 690464

URL: http://svn.apache.org/viewvc?rev=690464&view=rev
Log:
create message of right type

Modified:
    geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
    geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?rev=690464&r1=690463&r2=690464&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java Fri Aug 29 22:18:08 2008
@@ -69,7 +69,9 @@
     public CXFEndpoint(Bus bus, Object implementor) {
         this.bus = bus;
         this.implementor = implementor;
-        this.portInfo = (PortInfo) bus.getExtension(PortInfo.class);       
+        this.portInfo = (PortInfo) bus.getExtension(PortInfo.class);   
+        
+        this.bus.setExtension(this, CXFEndpoint.class);
     }
   
     protected URL getWsdlURL(URL configurationBaseUrl, String wsdlFile) {

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java?rev=690464&r1=690463&r2=690464&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java Fri Aug 29 22:18:08 2008
@@ -34,6 +34,7 @@
 import javax.xml.ws.handler.MessageContext;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.binding.Binding;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -55,13 +56,19 @@
 
     private MessageObserver messageObserver;
     private boolean passSecurityContext = false;
+    private CXFEndpoint endpoint;
 
     public GeronimoDestination(Bus bus, 
                                ConduitInitiator conduitInitiator, 
                                EndpointInfo endpointInfo) throws IOException {
         super(bus, conduitInitiator, endpointInfo, false);
+        this.endpoint = bus.getExtension(CXFEndpoint.class);
     }
 
+    private Binding getBinding() {
+        return this.endpoint.getEndpoint().getBinding();
+    }
+    
     public void setPassSecurityContext(boolean passSecurityContext) {
         this.passSecurityContext = passSecurityContext;
     }
@@ -115,7 +122,7 @@
         message.put(Message.ENCODING, getCharacterEncoding(servletRequest.getCharacterEncoding()));
         
         ExchangeImpl exchange = new ExchangeImpl();
-        exchange.setInMessage(message);
+        exchange.setInMessage(getBinding().createMessage(message));
         exchange.setSession(new HTTPSession(servletRequest));
         
         messageObserver.onMessage(message);