cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r683321 - in /cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/
Date Wed, 06 Aug 2008 16:38:52 GMT
Author: dkulp
Date: Wed Aug  6 09:38:52 2008
New Revision: 683321

URL: http://svn.apache.org/viewvc?rev=683321&view=rev
Log:
Merged revisions 683318 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r683318 | dkulp | 2008-08-06 12:31:08 -0400 (Wed, 06 Aug 2008) | 2 lines
  
  [CXF-1723] Output error message if fault has multple parts instead of generating bogus code.
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/Messages.properties
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  6 09:38:52 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/Messages.properties?rev=683321&r1=683320&r2=683321&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/Messages.properties
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/Messages.properties
Wed Aug  6 09:38:52 2008
@@ -19,4 +19,5 @@
 #
 #
 NON_UNIQUE_BODY = Non unique body parts! In a port, operations must have unique operation
signaure on the wire for successful dispatch. In port {0}, Operations \"{1}\" and \"{2}\"
have the same request body block {3}  
-WRAPPER_STYLE_NAME_COLLISION = Element {0} has Having the same name with different types[{1}
-- {2}],  In wrapper style, there is a collision as per the spec.
\ No newline at end of file
+WRAPPER_STYLE_NAME_COLLISION = Element {0} has Having the same name with different types[{1}
-- {2}],  In wrapper style, there is a collision as per the spec.
+FAULT_WITH_MULTIPLE_PARTS = Fault message {0} has multiple parts which is against WSDL specification.
\ No newline at end of file

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java?rev=683321&r1=683320&r2=683321&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
Wed Aug  6 09:38:52 2008
@@ -27,6 +27,7 @@
 
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -86,6 +87,16 @@
                     uniqueNames.put(mName, op.getName());
                 }
             }
+            
+            for (BindingFaultInfo fault : bo.getFaults()) {
+                if (fault.getFaultInfo().getMessageParts().size() > 1) {
+                    Message msg = new Message("FAULT_WITH_MULTIPLE_PARTS", LOG, 
+                                              fault.getFaultInfo().getName()
+                                                  .getLocalPart());
+                    addErrorMessage(msg.toString());
+                    return false;
+                }
+            }
         }
         return true;
     }



Mime
View raw message