svn commit: r530115 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/service/model/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/

[gn...@apache.org]

Author: gnodet
Date: Wed Apr 18 11:23:13 2007
New Revision: 530115

URL: http://svn.apache.org/viewvc?view=rev&rev=530115
Log:
Fix problem with FaultInfo being set on the UnwrappedOperationInfo instead of the OperationInfo depending if the service model is built from wsdl or from the class

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java?view=diff&rev=530115&r1=530114&r2=530115
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java Wed Apr 18 11:23:13 2007
@@ -19,8 +19,11 @@
 
 package org.apache.cxf.service.model;
 
+import java.util.Collection;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 public class UnwrappedOperationInfo extends OperationInfo {
     OperationInfo wrappedOp;
 
@@ -37,7 +40,17 @@
         return true;
     }
 
+    public FaultInfo addFault(QName name, QName message) {
+        return wrappedOp.addFault(name, message);
+    }
     
+    public FaultInfo getFault(QName name) {
+        return wrappedOp.getFault(name);
+    }
+    
+    public Collection<FaultInfo> getFaults() {
+        return wrappedOp.getFaults();
+    }
     
     public Object getProperty(String name) {
         return wrappedOp.getProperty(name);

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java?view=diff&rev=530115&r1=530114&r2=530115
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java Wed Apr 18 11:23:13 2007
@@ -40,7 +40,6 @@
 import org.apache.cxf.service.model.FaultInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.UnwrappedOperationInfo;
 
 public class WebFaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JaxWsServiceConfiguration.class);
@@ -89,10 +88,6 @@
     }
     
     private MessagePartInfo getFaultMessagePart(QName qname, OperationInfo op) {
-        if (op.isUnwrapped()) {
-            op = ((UnwrappedOperationInfo)op).getWrappedOperation();
-        }
-        
         for (FaultInfo faultInfo : op.getFaults()) {
             for (MessagePartInfo mpi : faultInfo.getMessageParts()) {
                 String ns = null;

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=530115&r1=530114&r2=530115
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Wed Apr 18 11:23:13 2007
@@ -354,6 +354,12 @@
                     p.setConcreteName(p.getName());
                 }
             }
+            
+            for (FaultInfo fault : uOp.getFaults()) {
+                for (MessagePartInfo p : fault.getMessageParts()) {
+                    p.setConcreteName(p.getName());
+                }
+            }
         } else {
             createMessageParts(intf, op, m);
         }