You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2006/12/19 09:54:14 UTC
svn commit: r488587 -
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Author: amilas
Date: Tue Dec 19 00:54:14 2006
New Revision: 488587
URL: http://svn.apache.org/viewvc?view=rev&rev=488587
Log:
revert the patch for 1882
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=488587&r1=488586&r2=488587
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Tue Dec 19 00:54:14 2006
@@ -1,7 +1,6 @@
package org.apache.axis2.description;
import com.ibm.wsdl.util.xml.DOM2Writer;
-import com.ibm.wsdl.extensions.soap12.SOAP12FaultImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingHelper;
@@ -17,7 +16,6 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyReference;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.apache.axiom.soap.impl.llom.soap11.SOAP11FaultImpl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -515,30 +513,10 @@
for (Iterator faultKeys = bindingFaultsMap.keySet().iterator(); faultKeys
.hasNext();) {
Object faultMapKey = faultKeys.next();
- BindingFault bindingFault = (BindingFault) bindingFaultsMap.get(faultMapKey);
- // accoding to the ws-basic profile and the wsdl 1.1 spec wsdl:fault element must have an
- // soap:fault extensibility element with the name attribute.
- String faultMappingName = null;
- Object nextElement;
- for (Iterator iter = bindingFault.getExtensibilityElements().iterator();
- iter.hasNext();){
- nextElement = iter.next();
- if (nextElement instanceof SOAP12Fault){
- SOAP12Fault soapFault = (SOAP12Fault) nextElement;
- faultMappingName = soapFault.getName();
- } else if (nextElement instanceof SOAPFault){
- SOAPFault soapFault = (SOAPFault) nextElement;
- faultMappingName = soapFault.getName();
- }
- }
-
- if (faultMappingName == null){
- throw new AxisFault("the fault binding " + bindingFault.getName()
- + " soap:fault element must be present and it should have an " +
- "name attribute to map to the wsdl:fault element.");
- }
-
- Fault wsdl4jFault = wsdl4jOperation.getFault(faultMappingName);
+ BindingFault bindingFault = (BindingFault) bindingFaultsMap
+ .get(faultMapKey);
+ Fault wsdl4jFault = wsdl4jOperation.getFault(bindingFault
+ .getName());
if (wsdl4jFault == null || wsdl4jFault.getMessage().getParts().size() == 0) {
throw new AxisFault("fault \"" + bindingFault.getName()
+ "\" not found in the Operation "
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org