svn commit: r569288 - in /incubator/cxf/trunk: rt/bindings/http/src/main/java/org/apache/cxf/binding/http/ rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ systests/src/test/java/org/apache/cxf/systest/rest/

[jliu]

Author: jliu
Date: Fri Aug 24 01:04:21 2007
New Revision: 569288

URL: http://svn.apache.org/viewvc?rev=569288&view=rev
Log:
Fixed cxf-938

Modified:
    
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java
    
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
    
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java

Modified: 
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java?rev=569288&r1=569287&r2=569288&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java
 (original)
+++ 
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java
 Fri Aug 24 01:04:21 2007
@@ -64,6 +64,10 @@
         info.setOperation(bop);
         locations.put(bop.getOperationInfo(), uri);
         verbs.put(bop.getOperationInfo(), verb);
+        if (bop.getOperationInfo().getUnwrappedOperation() != null) {
+            locations.put(bop.getUnwrappedOperation().getOperationInfo(), uri);
+            verbs.put(bop.getUnwrappedOperation().getOperationInfo(), verb);
+        }
         resources.add(info);
     }
     

Modified: 
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java?rev=569288&r1=569287&r2=569288&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
 (original)
+++ 
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
 Fri Aug 24 01:04:21 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.binding.http.interceptor;
 
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.w3c.dom.Document;
@@ -28,6 +29,7 @@
 import org.apache.cxf.binding.xml.interceptor.XMLMessageOutInterceptor;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.helpers.MapNamespaceContext;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.interceptor.StaxOutInterceptor;
@@ -37,6 +39,7 @@
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class DatabindingOutSetupInterceptor extends 
AbstractPhaseInterceptor<Message> {
     private static final WrappedOutInterceptor WRAPPED_OUT = new 
WrappedOutInterceptor();
@@ -57,6 +60,14 @@
             message.setContent(Node.class, document);
             
             XMLStreamWriter writer = new W3CDOMStreamWriter(document);
+            try {
+                MapNamespaceContext nsMap = new MapNamespaceContext();
+                nsMap.addNamespace(WSDLConstants.NP_SCHEMA_XSD, 
WSDLConstants.NU_SCHEMA_XSD);
+                writer.setNamespaceContext(nsMap);
+            } catch (XMLStreamException e) {
+                e.printStackTrace();
+                // ignore
+            }
             message.setContent(XMLStreamWriter.class, writer);
            
             WrappedOutInterceptor wrappedOut = new 
WrappedOutInterceptor(Phase.PRE_LOGICAL);

Modified: 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java?rev=569288&r1=569287&r2=569288&view=diff
==============================================================================
--- 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
 (original)
+++ 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
 Fri Aug 24 01:04:21 2007
@@ -91,7 +91,6 @@
     }
     
     @Test
-    @Ignore("fail due to cxf-938")
     public void testGetBookWrapped() throws Exception {
         JaxWsProxyFactoryBean sf = new JaxWsProxyFactoryBean();
         sf.setServiceClass(BookServiceWrapped.class);