axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r424829 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: CUtils.java c/AllParamWriter.java cpp/AllParamWriter.java
Date Sun, 23 Jul 2006 21:30:08 GMT
Author: nadiramra
Date: Sun Jul 23 14:30:07 2006
New Revision: 424829

URL: http://svn.apache.org/viewvc?rev=424829&view=rev
Log:
Use sanitiseClassName only if QName or string represents an anonymous type.

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java?rev=424829&r1=424828&r2=424829&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java Sun Jul 23
14:30:07 2006
@@ -936,7 +936,9 @@
         if((cpp && !qname2classmapCpp.containsKey(qname)) ||
            (!cpp && !qname2classmapC.containsKey(qname)))
         {
-            arrayName = CUtils.sanitiseClassName(qname.getLocalPart()) + "_Array";
+            arrayName = qname.getLocalPart() + "_Array";
+            if (TypeMap.isAnonymousType(qname))
+                arrayName = CUtils.sanitiseClassName(arrayName);
         }
         return arrayName;        
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java?rev=424829&r1=424828&r2=424829&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java Sun
Jul 23 14:30:07 2006
@@ -32,6 +32,7 @@
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
 import org.apache.axis.wsdl.wsdl2ws.info.Type;
 import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.info.TypeMap;
 
 /**
  * Parameter genarator.. genarate all necessary param classes
@@ -77,7 +78,8 @@
                     String elementType = type.getElementType();
                     if (elementType != null)
                     {
-                        elementType = CUtils.sanitiseClassName(elementType);
+                        if (TypeMap.isAnonymousType(elementType))
+                            elementType = CUtils.sanitiseClassName(elementType);
                         
                         if (WSDL2Ws.verbose)
                             System.out.println("    Array element type " 

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java?rev=424829&r1=424828&r2=424829&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java
Sun Jul 23 14:30:07 2006
@@ -33,6 +33,7 @@
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
 import org.apache.axis.wsdl.wsdl2ws.info.Type;
 import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.info.TypeMap;
 
 public class AllParamWriter implements SourceWriter
 {
@@ -70,7 +71,8 @@
                     String elementType = type.getElementType();
                     if (elementType != null)
                     {
-                        elementType = CUtils.sanitiseClassName(elementType);
+                        if (TypeMap.isAnonymousType(elementType))
+                            elementType = CUtils.sanitiseClassName(elementType);
                         
                         if (WSDL2Ws.verbose)
                             System.out.println("    Array element type " 



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


Mime
View raw message