[prev in list] [next in list] [prev in thread] [next in thread] 

List:       axis-cvs
Subject:    svn commit: r469438 -
From:       deepal () apache ! org
Date:       2006-10-31 10:28:46
Message-ID: 20061031102846.3BA8B1A9846 () eris ! apache ! org
[Download RAW message or body]

Author: deepal
Date: Tue Oct 31 02:28:45 2006
New Revision: 469438

URL: http://svn.apache.org/viewvc?view=rev&rev=469438
Log:
fixing 1561

Modified:
    webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java


Modified: webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
                
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsd \
l/src/org/apache/ws/java2wsdl/Java2OMBuilder.java?view=diff&rev=469438&r1=469437&r2=469438
 ==============================================================================
--- webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java \
                (original)
+++ webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java \
Tue Oct 31 02:28:45 2006 @@ -53,9 +53,9 @@
     private String targetNamespace;
 
     private String targetNamespacePrefix;
-    
+
     private String schemaTargetNamespace = null;
-    
+
     private String schemaTargetNamespacePrefix = null;
 
     private OMNamespace soap;
@@ -186,7 +186,7 @@
                 namespaceURI = messagePartType.getNamespaceURI();
                 // avoid duplicate namespaces
                 if ((namespacePrefix = (String) messagePartType.getPrefix()) == null \
                &&
-                        (namespacePrefix = (String) namespaceMap.get(namespaceURI)) \
== null ) {     +                        (namespacePrefix = (String) \
namespaceMap.get(namespaceURI)) == null) {  namespacePrefix = generatePrefix();
                     namespaceMap.put(namespaceURI, namespacePrefix);
                 }
@@ -207,7 +207,7 @@
                     + RESPONSE)) != null) {
                 namespaceURI = messagePartType.getNamespaceURI();
                 if ((namespacePrefix = (String) messagePartType.getPrefix()) == null \
                &&
-                        (namespacePrefix = (String) namespaceMap.get(namespaceURI)) \
== null ) {   +                        (namespacePrefix = (String) \
namespaceMap.get(namespaceURI)) == null) {  namespacePrefix = generatePrefix();
                     namespaceMap.put(namespaceURI, namespacePrefix);
                 }
@@ -232,7 +232,7 @@
                 if ((messagePartType = \
typeTable.getComplexSchemaType(jmethod.getSimpleName() + "Fault")) != null) {  \
                namespaceURI = messagePartType.getNamespaceURI();
                     if ((namespacePrefix = (String) messagePartType.getPrefix()) == \
                null &&
-                            (namespacePrefix = (String) \
namespaceMap.get(namespaceURI)) == null ) {   +                            \
(namespacePrefix = (String) namespaceMap.get(namespaceURI)) == null) {  \
namespacePrefix = generatePrefix();  namespaceMap.put(namespaceURI, namespacePrefix);
                     }
@@ -386,6 +386,7 @@
             if (jmethod.getExceptionTypes().length > 0) {
 
                 OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME, wsdl);
+                fault.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + \
                "Fault", null);
                 addExtensionElement(fac, fault, soap, SOAP_BODY, SOAP_USE, use,
                         "namespace", targetNamespace);
                 operation.addChild(fault);
@@ -431,9 +432,10 @@
                         "namespace", targetNamespace);
                 operation.addChild(output);
             }
-             if (jmethod.getExceptionTypes().length > 0) {
+            if (jmethod.getExceptionTypes().length > 0) {
 
                 OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME, wsdl);
+                fault.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + \
                "Fault", null);
                 addExtensionElement(fac, fault, soap12, SOAP_BODY, SOAP_USE, use,
                         "namespace", targetNamespace);
                 operation.addChild(fault);
@@ -452,7 +454,7 @@
 
     private void addExtensionElement(OMFactory fac, OMElement element, OMNamespace \
                namespace,
                                      String name, String att1Name, String att1Value, \
                String att2Name,
-                                     String att2Value , String att3Name,
+                                     String att2Value, String att3Name,
                                      String att3Value) {
         OMElement soapbinding = fac.createOMElement(name, namespace);
         element.addChild(soapbinding);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]