You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2006/09/15 17:29:13 UTC

svn commit: r446633 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl: symbolTable/ wsdl2ws/ wsdl2ws/cpp/ wsdl2ws/cpp/literal/ wsdl2ws/info/

Author: prestonf
Date: Fri Sep 15 08:29:12 2006
New Revision: 446633

URL: http://svn.apache.org/viewvc?view=rev&rev=446633
Log:
These fixes should make the UT_RestrictionOnPattern17667 test work.

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java Fri Sep 15 08:29:12 2006
@@ -17,6 +17,8 @@
 
 package org.apache.axis.wsdl.symbolTable;
 
+import java.util.Vector;
+
 import javax.xml.namespace.QName;
 
 /**
@@ -63,6 +65,12 @@
     //This specifies whether the element must be namespace qualified or not in the SOAP message.
     private boolean nsQualified = false;
     
+    // vvv FJP - 17667
+    private boolean restriction = false;
+    private String  restrictionBase = null;
+    private Vector  restrictionPattern = null;
+    private Vector  restrictionEnumeration = null;
+    // ^^^ FJP - 17667
     
     /** Field documentation */
     private String documentation;
@@ -224,4 +232,62 @@
         this.documentation = documentation;
     }
 
+    // vvv FJP - 17667
+    /**
+     * @return Returns the restriction.
+     */
+    public boolean isRestriction()
+    {
+        return restriction;
+    }
+    /**
+     * @param restriction The restriction to set.
+     */
+    public void setRestriction(boolean restriction)
+    {
+        this.restriction = restriction;
+    }
+    /**
+     * @return Returns the restrictionBase.
+     */
+    public String getRestrictionBase()
+    {
+        return restrictionBase;
+    }
+    /**
+     * @param restrictionBase The restrictionBase to set.
+     */
+    public void setRestrictionBase(String restrictionBase)
+    {
+        this.restrictionBase = restrictionBase;
+    }
+    /**
+     * @return Returns the restrictionEnumeration.
+     */
+    public Vector getRestrictionEnumeration()
+    {
+        return restrictionEnumeration;
+    }
+    /**
+     * @param restrictionEnumeration The restrictionEnumeration to set.
+     */
+    public void setRestrictionEnumeration(Vector restrictionEnumeration)
+    {
+        this.restrictionEnumeration = restrictionEnumeration;
+    }
+    /**
+     * @return Returns the restrictionPattern.
+     */
+    public Vector getRestrictionPattern()
+    {
+        return restrictionPattern;
+    }
+    /**
+     * @param restrictionPattern The restrictionPattern to set.
+     */
+    public void setRestrictionPattern(Vector restrictionPattern)
+    {
+        this.restrictionPattern = restrictionPattern;
+    }
+    // ^^^ FJP - 17667
 }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java Fri Sep 15 08:29:12 2006
@@ -30,6 +30,7 @@
 import org.apache.axis.wsdl.wsdl2ws.info.ElementInfo;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -201,9 +202,7 @@
      * @param symbolTable 
      * @return 
      */
-    public static Vector getContainedElementDeclarations(
-        Node node,
-        SymbolTable symbolTable)
+    public static Vector getContainedElementDeclarations( Node node, SymbolTable symbolTable)
     {
 
         if (node == null)
@@ -340,30 +339,19 @@
                 {
                     if (subNodeKind.getLocalPart().equals("sequence"))
                     {
-                        v.addAll(
-                            processSequenceNode(children.item(j), symbolTable));
+                        v.addAll( processSequenceNode(children.item(j), symbolTable));
                     }
-                    else
-                        if (subNodeKind.getLocalPart().equals("all"))
+                    else if (subNodeKind.getLocalPart().equals("all"))
                         {
-                            v.addAll(
-                                processAllNode(children.item(j), symbolTable));
+                        v.addAll( processAllNode(children.item(j), symbolTable));
                         }
-                        else
-                            if (subNodeKind.getLocalPart().equals("choice"))
+                    else if (subNodeKind.getLocalPart().equals("choice"))
                             {
-                                v.addAll(
-                                    processChoiceNode(
-                                        children.item(j),
-                                        symbolTable));
+                        v.addAll( processChoiceNode( children.item(j), symbolTable));
                             }
-                            else
-                                if (subNodeKind.getLocalPart().equals("group"))
+                    else if (subNodeKind.getLocalPart().equals("group"))
                                 {
-                                    v.addAll(
-                                        processGroupNode(
-                                            children.item(j),
-                                            symbolTable));
+                        v.addAll( processGroupNode( children.item(j), symbolTable));
                                 }
                 }
             }
@@ -2170,6 +2158,56 @@
         }
     }
 
+    // vvv FJP - 17667
+    private static void addRestrictionsToVector( Vector v, Node child, SymbolTable symbolTable, String base, String restType)
+    {
+        CElementDecl elem = new CElementDecl();
+        Vector       vr = null;
+        
+        NamedNodeMap nodeAttribs = child.getAttributes();
+
+        if( nodeAttribs != null)
+        {
+            for( int i = 0; i < nodeAttribs.getLength(); i++)
+            {
+                if( vr == null)
+                {
+                    vr = new Vector();
+                }
+                
+                if( nodeAttribs.item(i).getLocalName().equals( "name"))
+                {
+                    vr.add( nodeAttribs.item(i).getNodeValue());
+                }
+                else if( nodeAttribs.item(i).getLocalName().equals( "type"))
+                {
+                    vr.add( nodeAttribs.item(i).getNodeValue());
+                }
+                else if( nodeAttribs.item(i).getLocalName().equals( "value"))
+                {
+                    vr.add( nodeAttribs.item(i).getNodeValue());
+                }
+            }
+        }
+        
+        elem.setRestriction( true);
+        elem.setRestrictionBase( base);
+        
+        if( restType.equals( "pattern"))
+        {
+            elem.setRestrictionPattern( vr);
+        }
+        else
+        {
+            elem.setRestrictionEnumeration( vr);
+        }
+        
+        elem.setName( VALUE_QNAME);
+        
+        v.add( elem);
+    }
+    // ^^^ FJP - 17667
+
     /**
      * Return the attribute names and types if any in the node
      * The even indices are the attribute types (TypeEntry) and
@@ -2190,11 +2228,8 @@
      * @param symbolTable 
      * @return 
      */
-    public static Vector getContainedAttributeTypes(
-        Node node,
-        SymbolTable symbolTable)
+    public static Vector getContainedAttributeTypes( Node node, SymbolTable symbolTable)
     {
-
         Vector v = null; // return value
 
         if (node == null)
@@ -2287,15 +2322,75 @@
                 }
                 else
                 {
-
                     // we have an attribute
                     addAttributeToVector(v, child, symbolTable);
                 }
             }
         }
 
+// vvv FJP - 17667 - Code added
+// Expecting a schema simpleType
+        if (isXSDNode(node, "simpleType"))
+        {
+            // Under the simpleType there could be a restriction
+            NodeList children = node.getChildNodes();
+            Node     content = null;
+            String 	 base = null;
+            String   restType = null;
+
+            for (int j = 0; j < children.getLength(); j++)
+            {
+                Node kid = children.item(j);
+
+                if( isXSDNode(kid, "restriction"))
+                {
+                    content = kid;
+                    
+                    NamedNodeMap nnm = kid.getAttributes();
+
+                    for( int k = 0; k < nnm.getLength(); k++)
+                    {
+                        Node an = nnm.item( k);
+                        
+                        if( an.getLocalName().equals( "base"))
+                        {
+                            base = an.getNodeValue();
+                            
+                            break;
+                        }
+                    }
+                    break;
+                }
+            }
+
+            // Check for extensions or restrictions
+            if (content != null)
+            {
+                children = content.getChildNodes();
+
+                for (int j = 0; j < children.getLength(); j++)
+                {
+                    Node kid = children.item(j);
+
+                    if (isXSDNode(kid, "pattern")
+                        || isXSDNode(kid, "enumeration"))
+                    {
+                        restType = kid.getLocalName();
+
+    	                if (v == null)
+    	                {
+    	                    v = new Vector();
+    	                }
+    	
+                        addRestrictionsToVector( v, kid, symbolTable, base, restType);
+                    }
+                }
+            }
+        }
+
         return v;
     }
+    // ^^^ FJP - 17667
 
     // list of all of the XSD types in Schema 2001
 

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?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- 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 Fri Sep 15 08:29:12 2006
@@ -24,6 +24,7 @@
 package org.apache.axis.wsdl.wsdl2ws;
 
 import java.util.Hashtable;
+import java.util.Iterator;
 import javax.xml.namespace.QName;
 import java.util.Vector;
 import java.lang.reflect.Array;
@@ -35,7 +36,9 @@
 import org.apache.axis.wsdl.symbolTable.TypeEntry;
 import javax.xml.rpc.holders.BooleanHolder;
 import org.apache.axis.wsdl.symbolTable.SchemaUtils;
+import org.apache.axis.wsdl.wsdl2ws.info.Type;
 import org.apache.axis.wsdl.wsdl2ws.info.TypeMap;
+import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
 
 public class CUtils 
 {
@@ -1133,5 +1136,58 @@
         
         return sNew;
     }
+    // vvv FJP - 17667
+    public static Type findBaseTypeOfRestriction( Type type, WebServiceContext wscontext)
+    {
+        // FJP - Find base type of the restricted type.
+        Type   restType = type;
+        String restBaseType = null;
+        int    restBaseCount = 10;
+        String restBaseClass = null;
+        
+        while( restType != null && restBaseClass == null && restBaseCount > 0)
+        {
+	        restBaseType = restType.getRestrictionBase();
+	        restBaseType = restBaseType.substring( restBaseType.indexOf( ":") + 1);
+	        restBaseCount--;
+	        // Is the restBaseType as base type?
+	        restBaseClass = CUtils.getclass4qname( new QName( WrapperConstants.SOAPENC_NAMESPACE, restBaseType));
+
+	        while( restBaseClass == null && restType != null)
+	        {
+		        // Find the type in the type list.
+	            Iterator theBaseTypes = wscontext.getTypemap().getTypes().iterator();
+	            
+	            restType = null;
+	            
+	            while( theBaseTypes.hasNext())
+	            {
+	                Type aType = (Type) theBaseTypes.next();
+	                
+	                if( aType.getName().getLocalPart().equals( restBaseType))
+	                {
+	                    restType = aType;
+				        restBaseType = restType.getRestrictionBase();
+				        restBaseType = restBaseType.substring( restBaseType.indexOf( ":") + 1);
+	                    restBaseClass = CUtils.getclass4qname( new QName( WrapperConstants.SOAPENC_NAMESPACE, restBaseType));
+	                    break;
+	                }
+	            }
+            }
+        }
+
+        return restType;
+    }
+    // ^^^ FJP - 17667
+
+    // vvv FJP - 17667
+    public static String getBaseTypeOfRestrictionAsString( Type type)
+    {
+        String restBaseType = type.getRestrictionBase();
+        restBaseType = restBaseType.substring( restBaseType.indexOf( ":") + 1);
+        
+        return CUtils.getclass4qname( new QName( WrapperConstants.SOAPENC_NAMESPACE, restBaseType));
+    }
+    // ^^^ FJP - 17667
 }
 

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java Fri Sep 15 08:29:12 2006
@@ -152,16 +152,22 @@
 
         Binding binding = null;
         if (ports.hasNext())
+        {
             binding = ((Port) ports.next()).getBinding();
+        }
         
         if (binding == null)
+        {
             throw new WrapperFault("No binding specified");
+        }
         
         this.bindingEntry = symbolTable.getBindingEntry(binding.getQName());
 
         this.portTypeEntry = symbolTable.getPortTypeEntry(binding.getPortType().getQName());
         if (portTypeEntry == null)
+        {
             throw new WrapperFault("Service not found");
+        }
         
         ports = this.serviceentry.getService().getPorts().values().iterator();
         this.targetEndpointURI = SymbolTableParsingUtils.getTargetEndPointURI(ports);
@@ -192,6 +198,7 @@
         
         List operations = bindingEntry.getBinding().getBindingOperations();
         if (operations != null)
+        {
             for (int i = 0; i < operations.size(); i++)
             {
                 //for the each binding operation found
@@ -205,6 +212,7 @@
                     SymbolTableParsingUtils.getOutputInfo(bindinop.getBindingOutput(), method);
                 }
             }
+        }
     }
 
     /**
@@ -241,19 +249,28 @@
         
         //add each parameter to parameter list
         if ("document".equals(bindingEntry.getBindingStyle().getName()))
+        {
             this.addDocumentStyleInputMessageToMethodInfo(op, minfo);
+        }
         else
+        {
             this.addRPCStyleInputMessageToMethodInfo(op, minfo);
-
+        }
         //get the return type
         if (op.getOutput() != null)
         {
             Iterator returnlist = op.getOutput().getMessage().getParts().values().iterator();
             if (returnlist.hasNext()
                     && "document".equals(bindingEntry.getBindingStyle().getName()))
-                this.addDocumentStyleOutputMessageToMethodInfo(minfo, (Part) returnlist.next());
+            {
+                this.addDocumentStyleOutputMessageToMethodInfo(
+                    minfo,
+                    (Part) returnlist.next());
+            }
             else
+            {
                 this.addRPCStyleOutputMessageToMethodInfo(op, minfo);
+            }
         }
         
         return minfo;
@@ -281,36 +298,54 @@
                                    .getMessage()
                                    .getParts()
                                    .get((String) op.getParameterOrdering().get(ix)));
+                
                 if (p == null)
+                {
                     continue;
+                }
+                
                 pinfo = createParameterInfo(p);
+                
                 if (null != pinfo)
+                {
                     minfo.addOutputParameter(pinfo);
+                }
             }
             
             /* there can be more output parameters than in parameterOrder list (partial parameter ordering) */
             returnlist = op.getOutput().getMessage().getParts().values().iterator();
             while (returnlist.hasNext())
-            { 
-                //RPC style messages can have multiple parts
+            { //RPC style messages can have multiple parts
                 Part p = (Part) returnlist.next();
+                
                 if (op.getParameterOrdering().contains(p.getName()))
+                {
                     continue;
+                }
+                
                 pinfo = createParameterInfo(p);
+                
                 if (null != pinfo)
+                {
                     minfo.addOutputParameter(pinfo);
+                }
             }
         }
         else
         {
             returnlist = op.getOutput().getMessage().getParts().values().iterator();
+            
             while (returnlist.hasNext())
             { 
                 //RPC style messages can have multiple parts
                 Part p = ((Part) returnlist.next());
+                
                 pinfo = createParameterInfo(p);
+                
                 if (null != pinfo)
+                {
                     minfo.addOutputParameter(pinfo);
+                }
             }
         }
     }
@@ -328,7 +363,6 @@
         ParameterInfo pinfo;
         Type type;
         QName minfoqname;
-        
         element = symbolTable.getElement(part.getElementName());
         if (element == null)
         {
@@ -350,19 +384,29 @@
             boolean wrapped = wsdlWrappingStyle;
 
             if (type == null)
+            {
                 throw new WrapperFault("Unregistered type " + qname + " referred");
-
+            }
             //get inner attributes and elements and add them as parameters 
             if (wrapped)
+            {
+                //get inner attributes and elements and add them as parameters 
                 addOutputElementsToMethodInfo(minfo, type);
+            }
             else
             { 
                 // for non-wrapped style wsdl's
                 String elementName = (String) element.getQName().getLocalPart();
+                
                 pinfo = new ParameterInfo(type, elementName);
+                
                 pinfo.setElementName(type.getName());
+                
                 if (type.getName().equals(CUtils.anyTypeQname))
+                {
                     pinfo.setAnyType(true);
+                }
+                
                 minfo.addOutputParameter(pinfo);
             }
         }
@@ -377,37 +421,46 @@
         ParameterInfo pinfo;
         ElementInfo eleinfo;
         ArrayList elementlist = new ArrayList();
-        
         Iterator names = type.getElementnames();
+        
         while (names.hasNext())
         {
             elementlist.add(names.next());
         }
         
         Type innerType;
+        
         for (int i = 0; i < elementlist.size(); i++)
         {
             String elementname = (String) elementlist.get(i);
+            
             eleinfo = type.getElementForElementName(elementname);
             innerType = eleinfo.getType();
-            
             pinfo = new ParameterInfo(innerType, elementname);
             
             if (eleinfo.getMaxOccurs() > 1)
+            {
                 pinfo.setArray(true);
+            }
             
             pinfo.setNillable(eleinfo.getNillable());
             
             if (eleinfo.getMinOccurs() == 0)
+            {
                 pinfo.setOptional(true);
+            }
             else
+            {
                 pinfo.setOptional(false);
-
+            }
+            
             pinfo.setElementName(type.getElementForElementName(elementname).getName());
             
             if (innerType.getName().equals(CUtils.anyTypeQname))
+            {
                 pinfo.setAnyType(true);
-
+            }
+            
             minfo.addOutputParameter(pinfo);
         }
     }
@@ -424,6 +477,7 @@
         Iterator paramlist;
 
         minfo.setInputMessage(op.getInput().getMessage().getQName());
+        
         if (op.getParameterOrdering() != null)
         {
             for (int ix = 0; ix < op.getParameterOrdering().size(); ix++)
@@ -432,24 +486,35 @@
                                    .getMessage()
                                    .getParts()
                                    .get((String) op.getParameterOrdering().get(ix)));
+                
                 if (p == null)
+                {
                     continue;
-
+                }
+                
                 pinfo = createParameterInfo(p);
+                
                 if (null != pinfo)
+                {
                     minfo.addInputParameter(pinfo);
+                }
             }
         }
         else
         {
             paramlist = op.getInput().getMessage().getParts().values().iterator();
+            
             while (paramlist.hasNext())
             { 
                 //RPC style messages can have multiple parts
                 Part p = (Part) paramlist.next();
+                
                 pinfo = createParameterInfo(p);
+                
                 if (null != pinfo)
+                {
                     minfo.addInputParameter(pinfo);
+                }
             }
         }
     }
@@ -497,10 +562,13 @@
             if (qname != null)
             {
                 type = this.typeMap.getType(qname);
+            
                 boolean wrapped = wsdlWrappingStyle;
     
                 if (type == null)
+            {
                     throw new WrapperFault("unregistered type " + qname + " referred");
+            }
     
                 if (wrapped)
                 {
@@ -513,10 +581,14 @@
                     // for non-wrapped style wsdl's
                     String elementName = (String) element.getQName().getLocalPart();
                     pinfo = new ParameterInfo(type, elementName);
+                
                     pinfo.setElementName(type.getName());
+                
                     if (type.getName().equals(CUtils.anyTypeQname))
+                {
                         pinfo.setAnyType(true);
-
+                }
+                
                     minfo.addInputParameter(pinfo);
                 }
             }
@@ -532,6 +604,7 @@
         ParameterInfo pinfo;
         ArrayList attributeList = new ArrayList();
         Iterator attributeNames = type.getAttributeNames();
+
         while (attributeNames.hasNext())
         {
             attributeList.add(attributeNames.next());
@@ -541,10 +614,11 @@
         {
             String attributeName = (String) attributeList.get(i);
             Type innerType = type.getTypForAttribName(attributeName);
+            
             pinfo = new ParameterInfo(innerType, attributeName);
+            
             pinfo.setElementName(type.getTypForAttribName(attributeName).getName());
             pinfo.setAttribute(true);
-            
             minfo.addInputParameter(pinfo);
         }
     }
@@ -573,20 +647,27 @@
             pinfo = new ParameterInfo(innerType, elementname);
             
             if (eleinfo.getMaxOccurs() > 1)
+            {
                 pinfo.setArray(true);
-
+            }
+            
             pinfo.setElementName(type.getElementForElementName(elementname).getName());
             
             if (innerType.getName().equals(CUtils.anyTypeQname))
+            {
                 pinfo.setAnyType(true);
+            }
             
             pinfo.setNillable(eleinfo.getNillable());
             
             if (eleinfo.getMinOccurs() == 0)
+            {
                 pinfo.setOptional(true);
+            }
             else
+            {
                 pinfo.setOptional(false);
-
+            }
             minfo.addInputParameter(pinfo);
         }
     }
@@ -603,7 +684,9 @@
         while (it.hasNext())
         {
             type = (TypeEntry) it.next();
+            
             Node node = type.getNode();
+            
             if (node != null)
             {
                 if (WSDL2Ws.verbose)
@@ -627,28 +710,46 @@
     {
 
         if (targetLanguage == null)
+        {
             targetLanguage = "c++";
+        }
+        
         if (targetEngine == null)
+        {
             targetEngine = "server";
+        }
+        
         if (targetoutputLocation == null)
+        {
             targetoutputLocation = "./";
+        }
+        
         if (wsdlWrapStyle == null)
+        {
             wsdlWrapStyle = "wrapped";
-
+        }
+        
         this.language = targetLanguage;
 
         if (wsdlWrapStyle.equalsIgnoreCase("wrapped"))
+        {
             this.wsdlWrappingStyle = true;
+        }
         else
+        {
             this.wsdlWrappingStyle = false;
+        }
 
         preprocess();
 
         CUtils.setLanguage(language);
+        
         QName serviceqname = serviceentry.getService().getQName();
+        
         servicename = serviceqname.getLocalPart();
         typeMap = this.getTypeInfo(targetLanguage);
         methods = this.getServiceInfo(this.portTypeEntry.getPortType());
+        
         this.getWebServiceInfo();
 
         //TODO    check whether the name at the WrapperConstant Doclit is right "doc"
@@ -666,7 +767,9 @@
         WebServiceGenerator wsg = WebServiceGeneratorFactory.createWebServiceGenerator(wsContext);
         
         if (wsg == null)
+        {
             throw new WrapperFault("WSDL2Ws does not support the option combination");
+        }
         
         exposeReferenceTypes(wsContext);
         exposeMessagePartsThatAreAnonymousTypes(wsContext);
@@ -677,6 +780,7 @@
             System.out.println( "Dumping typeMap....");
             
             Iterator it = typeMap.getTypes().iterator();
+            
             while (it.hasNext())
             {
                 System.out.println(it.next());
@@ -705,7 +809,9 @@
                 SymTabEntry entry = (SymTabEntry) v.elementAt(i);
 
                 if (entry instanceof ServiceEntry)
+                {
                     return (ServiceEntry) entry;
+                }
             }
         }
         throw new WrapperFault("the service does not exists");
@@ -743,8 +849,9 @@
         
         // Do not add types which are not used in the wsdl
         if (!type.isReferenced())
+        {
             return null;
-        
+        }
         if (WSDL2Ws.verbose && !typeMap.isSimpleType(type.getQName()))
             System.out.println("Attempting to create type: " + type.getQName());
         
@@ -769,11 +876,15 @@
         { 
             /* it seems that this is an array */
             if (null == type.getRefType())
+            {
                 throw new WrapperFault("Array type found without a Ref type");
+            }
             
             QName qn = type.getRefType().getQName();
             if (null == qn)
+            {
                 throw new WrapperFault("Array type found without a Ref type");
+            }
             
             if (CUtils.isBasicType(qn))
                 return null;
@@ -846,7 +957,9 @@
                 //types declared as simpleType
                 restrictdata = CUtils.getRestrictionBaseAndValues(node, symbolTable);
                 if (restrictdata != null)
+                {
                     typedata.setRestrictiondata(restrictdata);
+                }
             }
             
             // There can be attributes in this extended basic type
@@ -854,13 +967,33 @@
             Vector attributes =
                 CSchemaUtils.getContainedAttributeTypes(type.getNode(), symbolTable);
             if (attributes != null)
+            {
+                if( attributes.get(0).getClass() == CElementDecl.class)
+                {
+	                for (int j = 0; j < attributes.size(); j++)
+	                {
+	                    CElementDecl ed = (CElementDecl) attributes.get(j);
+	                    
+	                    if( ed.isRestriction())
+	                    {
+	                        typedata.setRestriction( true);
+	                        typedata.setRestrictionBase( ed.getRestrictionBase());
+	                        typedata.setRestrictionEnumeration( ed.getRestrictionEnumeration());
+	                        typedata.setRestrictionPattern( ed.getRestrictionPattern());
+	                    }
+	                }
+                }
+                else
+                {
                 for (int j = 0; j < attributes.size(); j += 2)
                 {
                     newSecondaryType = createTypeInfo(((TypeEntry) attributes.get(j)).getQName(), targetLanguage);
                     typedata.addRelatedType(newSecondaryType);
                     typedata.setTypeForAttributeName(
                         ((QName) attributes.get(j + 1)).getLocalPart(), newSecondaryType);
+                    }
                 }
+            }
         }
         else if (type instanceof CollectionType)
         {
@@ -956,6 +1089,22 @@
                                                     true,
                                                     targetLanguage);
                             }
+	                                // vvv FJP - 17667
+	                                // FJP - Check if element is an extension or restriction
+	                                else if( elem.isRestriction())
+	                                { // 8 
+	                                    typedata.setRestriction( true);
+	                                    typedata.setRestrictionBase( elem.getRestrictionBase());
+	                                    typedata.setRestrictionEnumeration(elem.getRestrictionEnumeration());
+	                                    typedata.setRestrictionPattern( elem.getRestrictionPattern());
+	
+	                                    eleinfo = new ElementInfo( elem.getName(),
+	                                            				   new Type( CUtils.anyTypeQname,
+	                                            				           	 CUtils.anyTypeQname.getLocalPart(),
+	                                            				           	 true,
+	                                            				           	 targetLanguage));
+	                                } // 8
+	                                // ^^^ FJP - 17667
                             else
                             {
                                 QName typeName = elem.getType().getQName();
@@ -1036,7 +1185,9 @@
 
         Type type = this.typeMap.getType(qname);
         if (type == null)
+        {
             throw new WrapperFault("unregistered type " + qname + " referred");
+        }
         ParameterInfo parainfo = new ParameterInfo(type, part.getName());
         parainfo.setElementName(part.getElementName());
         return parainfo;
@@ -1045,8 +1196,12 @@
     private MethodInfo getMethodInfoByName(String name) throws WrapperFault
     {
         for (int i = 0; i < methods.size(); i++)
+        {
             if (((MethodInfo) methods.get(i)).getMethodname().equals(name))
+            {
                 return (MethodInfo) methods.get(i);
+            }
+        }
         
         throw new WrapperFault("binding and the port type do not match");
     }
@@ -1070,9 +1225,11 @@
         // get the main types
         Collection types = symbolTable.getTypeIndex().values();
         Iterator typeIterator = types.iterator();   
+        
         while(typeIterator.hasNext())
         {
             Object highLevelType = typeIterator.next();
+            
             if(!(highLevelType instanceof BaseType))
             {
                 DefinedType type = (DefinedType)highLevelType;

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java Fri Sep 15 08:29:12 2006
@@ -35,12 +35,15 @@
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Vector;
 
 import javax.xml.namespace.QName;
 
 import org.apache.axis.wsdl.symbolTable.BaseType;
 import org.apache.axis.wsdl.wsdl2ws.CUtils;
+import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
+import org.apache.axis.wsdl.wsdl2ws.info.AttributeInfo;
 import org.apache.axis.wsdl.wsdl2ws.info.Type;
 import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
 
@@ -136,8 +139,9 @@
         int anyCounter = 0;
         
         if (type.isArray())
+        {
             return;
-        
+        }
         try
         {
             for (int i = 0; i < attribs.length; i++)
@@ -154,15 +158,18 @@
                     String localMethodName = methodName.substring( 0, methodName.length() - 1);
                     
                     if( localMethodName.equals( classname))
+                    {
                         methodName = localMethodName; 
+                    }
                 }
                 
                 if (attribs[i].isArray())
                 {
                     String parameterTypeName = properParamName;
                     if (!parameterTypeName.endsWith("*"))
+                    {
                         parameterTypeName += " *";
-                    
+                    }
                     writer.write("\n" + parameterTypeName + " " + classname
                             + "::get" + methodName + "()\n{\n");
 
@@ -182,15 +189,20 @@
                         writer.write("\t\t" + parameterName + " = new " + type + "_Array();\n");
                     }
                     else
+                    {
                         writer.write("\t\t" + parameterName + " = new " + properParamName + "();\n");
+                    }
                     
                     writer.write("\t}\n");
                     
                     if (attribs[i].getChoiceElement() || attribs[i].getAllElement())
+                    {
                         writer.write("\t" + parameterName + "->clone( *pInValue);\n");
+                    }
                     else
+                    {
                         writer.write("\t" + parameterName + "->clone( *pInValue);\n");
-
+                    }
                     writer.write("}\n");
                 }
                 else if (isElementNillable(i)  || isElementOptional(i))
@@ -204,12 +216,16 @@
                     if(attribs[i].getAllElement() || attribs[i].getChoiceElement() )
                     {
                         if (isElementNillable(i))
+	                    	{
                             writer.write("\n" + properParamName + " * " + classname
                                 + "::get" + methodName + "()\n{\n");
+	                    	}
                         else 
+	                    	{
                             writer.write("\n" + properParamName + " " + classname
                                     + "::get" + methodName + "()\n{\n");
-                    }
+	                    	}
+	                    }
                     else
                     {
                         writer.write("\n" + properParamName + " * " + classname
@@ -221,14 +237,18 @@
                     if(attribs[i].getAllElement() || attribs[i].getChoiceElement())
                     {
                         if (isElementNillable(i))
+	                    	{
                             writer.write("\n" + "void " + classname + "::set"
                                     + methodName + "(" + properParamName
                                     + " * pInValue, bool deep)\n{\n");
+	                    	}
                         else
+	                    	{
                             writer.write("\n" + "void " + classname + "::set"
                                 + methodName + "(" + properParamName
                                 + " pInValue, bool deep)\n{\n");
-                    }
+	                    	}
+	                    }
                     else
                     {
                         writer.write("\n" + "void " + classname + "::set"
@@ -252,12 +272,18 @@
                     if(attribs[i].getAllElement() || attribs[i].getChoiceElement())
                     {
                         if (isElementNillable(i))
+                        	{
                             writer.write("\t\t\t" + parameterName + " = new " + type + "*();\n");
+                        	}
                         else
+                        	{
                             writer.write("\t\t\t" + parameterName + " = new " + type + "();\n");
-                    }
+                        	}
+                        }
                     else
+                        {
                         writer.write("\t\t\t" + parameterName + " = new " + properParamName + "();\n");
+                        }
                     
                     writer.write("\t\t\t*" + parameterName + " = *pInValue;\n");
                     writer.write("\t\t}\n");
@@ -301,6 +327,27 @@
                         methodName = methodName + Integer.toString(anyCounter);
                     }
 
+	                    Type attributeType = attribs[i].getType();
+	    				boolean isPointerType = false;
+	    				
+	    				if( attributeType.isRestriction())
+	    				{
+	    				    // Find the base type of the restriction.
+	    				    attributeType = CUtils.findBaseTypeOfRestriction( attributeType, wscontext);
+	    				    
+	    				    String attributeTypeAsString = CUtils.getBaseTypeOfRestrictionAsString( attributeType); 
+	    				    
+	    				    if( CUtils.isPointerType( attributeTypeAsString))
+	    				    {
+	    				        int pointerOffset = properParamName.indexOf("*");
+	    				        
+	    				        if( pointerOffset > 0)
+	    				        {
+	    				            properParamName = properParamName.substring( 0, pointerOffset);
+	    				        }
+	    				    }
+	    				}
+	    				
                     writer.write("\n"
                             + properParamName + " " + classname + "::get" + methodName
                             + "()\n{\n");
@@ -315,17 +362,22 @@
                             + "void " + classname + "::set"
                             + methodName + "(" + properParamName + " InValue");
                     
-                    Type attributeType = attribs[i].getType();
+//                    attributeType = attribs[i].getType();
+                    isPointerType = false;
                     
-                    boolean isPointerType = false;
                     if (attributeType.isSimpleType())
+	    				{
                         isPointerType = CUtils.isPointerType(CUtils.getclass4qname(attributeType.getBaseType())); 
+	    				}
                     else
+	    				{
                         isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
-                    
-                    if((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) 
-                            && (isPointerType || attribs[i].getAllElement() || attribs[i].getChoiceElement()))
+	    				}
+	                    if((attribs[i].isSimpleType() || attributeType.isSimpleType()) &&
+	                       (isPointerType || attribs[i].getAllElement() || attribs[i].getChoiceElement()))
+	                    {
                         writer.write(", bool deep");
+	                    }
                     
                     writer.write(")\n{\n");
                     
@@ -475,65 +527,149 @@
         writer.write( "\t}\n\n");
         
         writer.write("\t/* If there are any attributes serialize them. If there aren't then close the tag */\n");
+        // vvv FJP - 17667
         for (int i = 0; i < attributeParamCount; i++)
         {
-            if (attribs[i].isArray() || !(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
+            AttributeInfo ai = attribs[i];
+            Type          type = ai.getType();
+            boolean       repeat = false;
+            boolean       forceSimpleType = false;
+            int           countdown = 5;
+            
+            do
+            {
+                repeat = false;
+                
+	            if( type.isRestriction())
+	            {
+	                writer.write("\t// A restricted type (base=" + type.getRestrictionBase() + ") has been found.  The following restrictions need to be applied:-\n");
+	
+	                Vector vre = type.getRestrictionEnumeration();
+	                Vector vrp = type.getRestrictionPattern();
+	
+	                if( vre != null)
+	                {
+	                    writer.write("\t//\t Enumeration:\n");
+	                    
+	                    for( int j = 0; j < vre.size(); j++)
+	                    {
+	                        writer.write("\t//\t\t " + vre.get( j) + "\n");
+	                    }
+	                }
+	                
+	                if( vrp != null)
+	                {
+	                    writer.write("\t//\t Pattern:\n");
+	                    
+	                    for( int j = 0; j < vrp.size(); j++)
+	                    {
+	                        writer.write("\t//\t\t " + vrp.get( j) + "\n");
+	                    }
+	                }
+                
+	                // Locate base type for restricted type
+	                String base = type.getRestrictionBase();
+	                String baseType = null;
+	                
+	                base = base.substring( base.indexOf( ":") + 1);
+	                baseType = CUtils.getclass4qname( new QName( WrapperConstants.SCHEMA_NAMESPACE, base));
+	                
+	                if( baseType == null)
+	                {
+	                    Iterator itmt = wscontext.getTypemap().getTypes().iterator();
+	                
+	                    while( itmt.hasNext())
+		                {
+		                    Type t = (Type) itmt.next();
+		                    
+		                    if( t.getName().getLocalPart().equals( base))
+		                    {
+		                        type = t;
+		                        repeat = true;
+		                        countdown--;
+		                        break;
+		                    }
+		                }
+	                }
+	                else
+	                {
+				        baseType = baseType.substring( baseType.lastIndexOf( "_") + 1);
+				        
+	                    type.setBaseType( new QName( WrapperConstants.SCHEMA_NAMESPACE, baseType));
+	                    
+	                    ai.setType( type);
+	                    
+	                    forceSimpleType = true;
+	                }
+	            }
+            
+	            if ((ai.isArray() || !(ai.isSimpleType() || ai.getType().isSimpleType())) && !repeat)
+	            {
+	                    throw new WrapperFault("Error : an attribute is not basic type");
+	            }
+
+            } while( repeat && countdown > 0);
+            // ^^^ FJP - 17667
+            
+            //Samisa
+            //remove _Ref sufix and _ prefix in SOAP tag name
+            String soapTagName = ai.getParamName();
+            if (soapTagName.lastIndexOf("_Ref") > -1)
             {
-                throw new WrapperFault("Error : an attribute is not basic type");
+                soapTagName = soapTagName.substring(0, soapTagName.lastIndexOf("_Ref"));
+            }
+            
+            if (soapTagName.charAt(0) == '_')
+            {
+                soapTagName = soapTagName.substring(1, soapTagName.length());
+            }
+            //end remove _Ref sufix and _ prefix in SOAP tag name
+			boolean isPointerType = false;
+			String basicType = null;
+			
+			if (!ai.isSimpleType() && type.isSimpleType())
+			{
+		        basicType = CUtils.getclass4qname( type.getBaseType());
+
+			    String	class4QName = CUtils.getclass4qname(type.getBaseType());
+			    
+			    isPointerType = CUtils.isPointerType( class4QName); 
+			}
+			else
+			{
+			    basicType = ai.getTypeName();
+			    isPointerType = CUtils.isPointerType(ai.getTypeName());
+			}
+            if (isPointerType)
+            {
+                writer.write("\tif (0 != param->"
+                        + ai.getParamNameAsMember() + ")\n");
+                writer.write("\t\tpSZ->serializeAsAttribute(\""
+                        + soapTagName
+                        + "\", 0, (void*)(param->"
+                        + ai.getParamNameAsMember()
+                        + "), "
+                        + CUtils.getXSDTypeForBasicType(basicType) + ");\n");
             }
             else
             {
-                //remove _Ref sufix and _ prefix in SOAP tag name
-                String soapTagName = attribs[i].getParamName();
-                if (soapTagName.lastIndexOf("_Ref") > -1)
-                    soapTagName = soapTagName.substring(0, soapTagName.lastIndexOf("_Ref"));
-                
-                if (soapTagName.charAt(0) == '_')
-                    soapTagName = soapTagName.substring(1, soapTagName.length());
-
-                Type type = attribs[i].getType();
-                boolean isPointerType = false;
-                String basicType = null;
-                
-                if (!attribs[i].isSimpleType() && type.isSimpleType())
-                {
-                    basicType = CUtils.getclass4qname(attribs[i].getType().getBaseType());
-                    isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType())); 
-                }
-                else
-                {
-                    basicType = attribs[i].getTypeName();
-                    isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
-                }
-                
-                if (isPointerType)
-                {
-                    writer.write("\tif (0 != param->" + attribs[i].getParamNameAsMember() + ")\n");
-                    writer.write("\t\tpSZ->serializeAsAttribute(\""
-                            + soapTagName + "\", 0, (void*)(param->"
-                            + attribs[i].getParamNameAsMember() + "), "
-                            + CUtils.getXSDTypeForBasicType(basicType) + ");\n");
-                }
-                else
-                {
-                    writer.write("\tpSZ->serializeAsAttribute(\""
-                            + soapTagName
-                            + "\", 0, (void*)&(param->"
-                            + attribs[i].getParamNameAsMember()
-                            + "), "
-                            + CUtils.getXSDTypeForBasicType(attribs[i].getTypeName()) + ");\n");
-                }
-                
-                if (!attribs[i].isOptional())
-                {
-                    /* This avoid segmentation fault at runtime */
-                    /*
-                     * writer.write("\telse\n");
-                     * writer.write("\t\tAXISTRACE1(\"The mandatory attribute
-                     * "+attribs[i].getParamName()+" is not set\",
-                     * CRITICAL);\n");
-                     */
-                }
+                writer.write("\t\tpSZ->serializeAsAttribute(\""
+                        + soapTagName
+                        + "\", 0, (void*)&(param->"
+                        + attribs[i].getParamNameAsMember()
+                        + "), "
+                        + CUtils.getXSDTypeForBasicType(attribs[i].getTypeName()) + ");\n");
+            }
+            
+            if (!attribs[i].isOptional())
+            {
+                /* This avoid segmentation fault at runtime */
+                /*
+                 * writer.write("\telse\n");
+                 * writer.write("\t\tAXISTRACE1(\"The mandatory attribute
+                 * "+attribs[i].getParamName()+" is not set\",
+                 * CRITICAL);\n");
+                 */
             }
         }
         

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java Fri Sep 15 08:29:12 2006
@@ -59,7 +59,17 @@
             writePreprocessorStatements();
             
             if (type.isSimpleType())
+            {
                 writeRestrictionCheckerFunction();
+            }
+            else
+            {
+                // vvv FJP - 17667
+                if( type.isRestriction())
+                {
+                    writer.write( "\n// Type consists of purely 'restriction' information.\n// Currently no code has been written, but some may be required to check the restriction.\n\n");
+                }
+                // ^^^ FJP - 17667
             else
             {
                 writeGlobalCodes();
@@ -67,6 +77,7 @@
                 writeConstructors();
                 writeDestructors();
                 writeMethods();
+            }
             }
             
             writer.flush();

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java Fri Sep 15 08:29:12 2006
@@ -62,31 +62,90 @@
                     + getFileType().toUpperCase() + "_H__INCLUDED_\n\n");
 
             if (type.isSimpleType())
+            {
                 writeSimpleTypeWithEnumerations();
+            }
             else
             {
-                writePreprocessorStatements();
-
                 classname = CUtils.sanitiseClassName( classname);
-                
-                this.writer.write("class STORAGE_CLASS_INFO " + classname);
-                if (this.type.isFault())
-                    this.writer.write(" : public SoapFaultException");
-                this.writer.write("\n{\n");
-                writeAttributes();
-                writeGetSetMethods();
-                writeConstructors();
-                writeDestructors();
-                writeDeepCopyFlags();
-                this.writer.write("};\n\n");
+
+                // vvv FJP - 17667
+                // Check that type is not a restriction
+                if( type.isRestriction())
+                {
+                    String	baseType = type.getRestrictionBase();
+
+                    baseType = baseType.substring( baseType.indexOf( ":") + 1);
+
+                    writer.write( "#include \"" + baseType + ".hpp\"\n\n");
+                    writer.write( "// " + classname + " is a restricted type (base=" + baseType + ").\n// The following restrictions need to be applied:-\n");
+
+                    Vector vre = type.getRestrictionEnumeration();
+                    Vector vrp = type.getRestrictionPattern();
+
+                    if( vre != null)
+                    {
+                        writer.write("//\t Enumeration:\n");
+                        
+                        for( int j = 0; j < vre.size(); j++)
+                        {
+                            writer.write("//\t\t " + vre.get( j) + "\n");
+                        }
+                    }
+                    
+                    if( vrp != null)
+                    {
+                        writer.write("//\t Pattern:\n");
+                        
+                        for( int j = 0; j < vrp.size(); j++)
+                        {
+                            writer.write("//\t\t " + vrp.get( j) + "\n");
+                        }
+                    }
+                    
+                    writer.write( "\ntypedef " + baseType + " " + classname + ";\n\n");
+                }
+                // ^^^ FJP - 17667
+                else
+                {
+	                writePreprocessorStatements();
+	
+	                this.writer.write("class STORAGE_CLASS_INFO " + classname);
+	                
+	                if (this.type.isFault())
+	                {
+	                    this.writer.write(" : public SoapFaultException");
+	                }
+	                
+	                this.writer.write("\n{\n");
+	                
+	                writeAttributes();
+	
+	                /**
+	                 * Dushshantha: Call writeGetSetMethods() method.
+	                 */
+	
+	                writeGetSetMethods();
+	                //..................................
+	                writeConstructors();
+	                writeDestructors();
+	                writeDeepCopyFlags();
+	                
+	                this.writer.write("};\n\n");
+                }
             }
+            
             this.writer.write("#endif /* !defined(__" + classname.toUpperCase()
                     + "_" + getFileType().toUpperCase() + "_H__INCLUDED_)*/\n");
             writer.flush();
             writer.close();
+            
             if (WSDL2Ws.verbose)
-                System.out.println(getFilePath().getAbsolutePath() + " created.....");
-        } 
+            {
+                System.out.println(getFilePath().getAbsolutePath()
+                        + " created.....");
+            }
+        }
         catch (IOException e)
         {
             e.printStackTrace();
@@ -100,10 +159,14 @@
     private void writeDeepCopyFlags() throws WrapperFault
     {
         if (type.isArray())
+        {
             return;
+        }
         
         if (attribs.length == 0)
+        {
             return;
+        }
         
         try
         {
@@ -114,12 +177,38 @@
                 boolean isPointerType = false;
                 
                 if (type.isSimpleType())
+				{
                     isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType())); 
-                else
-                    isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
-
-                if ((attribs[i].isSimpleType() 
-                        || attribs[i].getType().isSimpleType()) 
+				}
+				else
+				{
+			        // vvv FJP - 17667
+				    if( type.isRestriction())
+				    {
+				        // FJP - Find base type of the restricted type.
+				        type = CUtils.findBaseTypeOfRestriction( type, wscontext);
+				        String restBaseClass = CUtils.getBaseTypeOfRestrictionAsString( type);
+
+				        if( type == null)
+				        {
+				            System.out.println( "Warning - Could not find root base class of " + type.getName().getLocalPart());
+				        }
+				        else
+				        {
+					        if( restBaseClass != null)
+					        {
+					            isPointerType = CUtils.isPointerType( restBaseClass);
+					        }
+				        }
+				    }
+			        // ^^^ FJP - 17667
+				    else
+				    {
+					    isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
+				    }
+				}
+				
+        	    if ((attribs[i].isSimpleType() || type.isSimpleType())
                         && !attribs[i].isArray() 
                         && (isElementNillable(i) 
                                 || isElementOptional(i) 
@@ -328,14 +417,35 @@
                             + Integer.toString(anyCounter)
                             + ";\n");
                 }
-                    
-                else
-                {
-                    writer.write("\t"
-                                + getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
-                                + " " + attribs[i].getParamNameWithoutSymbols()
-                                + ";\n");
-                }
+				else
+				{
+			        // vvv FJP - 17667
+					if( attribs[i].getType().isRestriction())
+					{
+					    String  typeName = getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]);
+					    Type    baseType = CUtils.findBaseTypeOfRestriction( attribs[i].getType(), wscontext);
+					    boolean	isPointer = CUtils.isPointerType( CUtils.getBaseTypeOfRestrictionAsString( baseType));
+					  
+					    if( isPointer)
+					    {
+					        int	pointerPos = typeName.indexOf( "*");
+					        
+					        if( pointerPos > 0)
+					        {
+					            typeName = typeName.substring( 0, pointerPos);
+					        }
+					    }
+					    
+					    writer.write( "\t" + typeName + " " + attribs[i].getParamNameWithoutSymbols() + ";\n");
+					}
+			        // ^^^ FJP - 17667
+					else
+					{
+					    writer.write( "\t" +
+					                  getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]) +
+					                  " " + attribs[i].getParamNameWithoutSymbols() + ";\n");
+					}
+				}								
             }
             
             if (extensionBaseAttrib != null &&
@@ -465,25 +575,46 @@
                 }
                 else 
                 {
-                    writer.write("\n\t"
-                                + getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
-                                + " get" + methodName + "();\n");
-
-                    writer.write("\t"
-                                + "void set" + methodName + "("
-                                + getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
-                                + " InValue");
-                    
+                    // vvv FJP - 17667
                     Type type = attribs[i].getType();
                     boolean isPointerType = false;
+                    String	typeName = getCorrectParmNameConsideringArraysAndComplexTypes( attribs[i]);
+                    
+                    // Check for restriction.  If found, then find base type.
+                    if( type.isRestriction())
+                    {
+                        type = CUtils.findBaseTypeOfRestriction( type, wscontext);
+                    }
                     
                     if (type.isSimpleType())
                         isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType())); 
                     else
                         isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
+
+                    if( type.isRestriction() && isPointerType)
+                    {
+                        int pointerLocation = typeName.indexOf( "*");
+                        
+                        if( pointerLocation > 0)
+                        {
+                            typeName = typeName.substring( 0, pointerLocation);
+                        }
+                    }
+                    // ^^^ FJP - 17667
+
                     
+                    writer.write("\n\t"
+                            + typeName
+                            + " get" + methodName + "();\n");
+
+                    writer.write("\t"
+                            + "void set" + methodName + "("
+                            + typeName
+                            + " InValue");
+                
+
                     if ( (attribs[i].getAllElement() || attribs[i].getChoiceElement() || isPointerType) 
-                         && (attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
+                         && (attribs[i].isSimpleType() || type.isSimpleType()))
                         writer.write(", bool deep = true");
                     
                     writer.write(");\n");
@@ -617,10 +748,13 @@
             typeSet = new HashSet();
             for (int i = 0; i < attribs.length; i++)
             {
-                if (!attribs[i].isArray() && 
-                        !(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType())
-                        && !attribs[i].isAnyType())
+				if (!attribs[i].isArray() &&
+				    !(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) &&
+					!attribs[i].isAnyType() &&
+					!attribs[i].getType().isRestriction())
+				{
                     typeSet.add(attribs[i].getTypeName());
+				}
             }
             
             itr = typeSet.iterator();

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java Fri Sep 15 08:29:12 2006
@@ -67,24 +67,41 @@
                 
                 //write return type
                 if (0 == noOfOutParams)
-                    writer.write("\tSTORAGE_CLASS_INFO void ");
-                else if (1 == noOfOutParams)
                 {
-                    ParameterInfo returnParam =
-                        (ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
-                    String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
-                    if ((outParamTypeName.lastIndexOf ("_Array") > 0) 
-                            || (CUtils.isSimpleType(outParamTypeName)
-                            && (returnParam.isNillable() || returnParam.isOptional())
-                            && !(CUtils.isPointerType(outParamTypeName))))
-                        writer.write("\tSTORAGE_CLASS_INFO " + outParamTypeName + " * ");
-                    else
-                        writer.write("\tSTORAGE_CLASS_INFO " + outParamTypeName + " ");
+                    writer.write("\tSTORAGE_CLASS_INFO void ");
                 }
                 else
                 {
-                    isAllTreatedAsOutParams = true;
-                    writer.write("\tSTORAGE_CLASS_INFO void ");
+                    if (1 == noOfOutParams)
+                    {
+                        ParameterInfo returnParam =
+                            (ParameterInfo) minfo
+                                .getOutputParameterTypes()
+                                .iterator()
+                                .next();
+                        String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
+                        if ((outParamTypeName.lastIndexOf ("_Array") > 0) 
+                                || (CUtils.isSimpleType(outParamTypeName)
+								&& (returnParam.isNillable() || returnParam.isOptional())
+								&& !(CUtils.isPointerType(outParamTypeName))))
+                        {
+                        	writer.write(
+                                    "\tSTORAGE_CLASS_INFO "
+                                        + outParamTypeName
+                                        + " * ");
+                        }
+                        else{
+                        writer.write(
+                            "\tSTORAGE_CLASS_INFO "
+                                + outParamTypeName
+                                + " ");
+                        }
+                    }
+                    else
+                    {
+                        isAllTreatedAsOutParams = true;
+                        writer.write("\tSTORAGE_CLASS_INFO void ");
+                    }
                 }
                 //write return type
                 writer.write(minfo.getMethodname() + "(");
@@ -103,19 +120,28 @@
                     String baseTypeName = null;
                     
                     if (type.isSimpleType())
+                    {
                         baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+                    }
                     else
+                    {
                         baseTypeName = paramTypeName;
-                    
+                    }
                     if (nparam.getType().isAttachment())
+                    {
                         writer.write("ISoapAttachment *Value" + j);
+                    }
                     else if ((paramTypeName.lastIndexOf ("_Array") > 0)
                                 || (CUtils.isSimpleType(baseTypeName)
                                         && (nparam.isNillable() || nparam.isOptional())
                                         && !(CUtils.isPointerType(baseTypeName))))
+                    {
                         writer.write(paramTypeName + " * Value" + j);
+                    }
                     else
+                    {
                         writer.write(paramTypeName + " Value" + j);
+                    }
                 }
 
                 if (isAllTreatedAsOutParams)
@@ -129,14 +155,19 @@
                         String baseTypeName = null;
                         
                         if (type.isSimpleType())
+                        {
                             baseTypeName = CUtils.getclass4qname (type.getBaseType ());
+                        }
                         else
+                        {
                             baseTypeName = paramType;
-                        
+                        }
                         boolean bTypeHasStar = paramType.endsWith( "*");
                         
                         if (hasInputParms || 0!=j)
+                        {
                             writer.write(", ");
+                        }
                         
                         writer.write("AXIS_OUT_PARAM " + paramType);
                         if (CUtils.isSimpleType(baseTypeName))
@@ -146,18 +177,27 @@
                                     && !CUtils.isPointerType(baseTypeName))
                             {
                                 if (bTypeHasStar)
+	                            {
                                     writer.write(" *");
+	                            }
                                 else
+	                            {
                                     writer.write(" **");
-                            }
+	                            }
+	                        }
                             else if (CUtils.isPointerType(baseTypeName) || !bTypeHasStar)
+	                        {
                                 writer.write(" *");
+	                        }
                         }
                         else if(bTypeHasStar)
+                        {
                             writer.write(" *");
+                        }
                         else
+                        {
                             writer.write(" **");
-                        
+                        }
                         writer.write(" OutValue" + j);
                     } // for loop
                 }
@@ -193,13 +233,19 @@
                 if(atype.isExternalized())
                 {
                     if (atype.isArray())
+                    {
                         if (atype.getElementType().equals("string"))
+                        {
                             removeSet.add(atype.getLanguageSpecificName());
-                    
+                        }
+                    }
                     if (atype.getBaseType() != null)
+                    {
                         if (atype.getBaseType().getLocalPart().equals("string"))
+                        {
                             removeSet.add(atype.getLanguageSpecificName() + "_Array");
-
+                        }
+                    }
                     typeSet.add(atype.getLanguageSpecificName());
                 }
             }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java Fri Sep 15 08:29:12 2006
@@ -119,8 +119,11 @@
                      + getServiceName () + "_" + classname + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
             }
             else
-                writer.write ("#include \"" + classname + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
-
+	    {
+		writer.write ("#include \""
+			      + classname
+			      + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
+	    }
             writer.write ("#include <axis/AxisWrapperAPI.hpp>\n");
             writer.write ("#include <axis/Axis.hpp>\n\n");
         }
@@ -154,12 +157,22 @@
         int noOfOutParams = minfo.getOutputParameterTypes().size();
         
         if (0 == noOfOutParams)
+	{
             returntype = null;
-        else if (1 == noOfOutParams)
-            returntype = (ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
+	}
+	else
+	{
+	    if (1 == noOfOutParams)
+	    {
+		returntype =
+		    (ParameterInfo) minfo.getOutputParameterTypes ().
+		    iterator ().next ();
+	    }
         else
+	    {
             isAllTreatedAsOutParams = true;
-      
+	    }
+	}
         Collection params = minfo.getInputParameterTypes ();
         String methodName = minfo.getMethodname ();
         Type retType = null;
@@ -168,12 +181,15 @@
         String outparamType = null;
         
         if (returntype != null)
+	{
             retType = wscontext.getTypemap ().getType (returntype.getSchemaName ());
-        
+	}
         if (retType != null)
         {
             if (retType.isSimpleType ())
+	    {
                 outparamType = CUtils.getclass4qname (retType.getBaseType ());
+	    }
             else
             {
                 outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays (returntype, wscontext);
@@ -182,12 +198,17 @@
             
             returntypeisarray |= retType.isArray ();
         }
-        else if (returntype != null)
+	else
+	{
+	    if (returntype != null)
+	    {
             outparamType = returntype.getLangName ();
-        
+	    }
+	}
         if (returntype != null)
+	{
             returntypeissimple = CUtils.isSimpleType (outparamType);
-
+	}
         writer.write ("\n/*\n");
         writer.write (" * This method wrap the service method" + methodName + "\n");
         writer.write (" */\n");
@@ -199,16 +220,26 @@
         Type type;
         
         if (returntype == null)
+	{
             writer.write ("void");
-        else if (returntypeissimple
+	}
+	else
+	{
+	    if (returntypeissimple
                     && (!(returntype.isNillable() || returntype.isOptional()) 
                             || CUtils.isPointerType(outparamType)))
+	    {
             writer.write (outparamType);
+	    }
         else if (outparamType.lastIndexOf ("*") > 0)
+	    {
             writer.write (outparamType);
-        else //for AnyType too
+	    }
+	    else
+	    {			//for AnyType too
             writer.write (outparamType + "*");
-
+	    }
+	}
         writer.write (" " + classname + "::" + methodName + "(");
         ArrayList paramsB = (ArrayList) params;
         ParameterInfo paramtype = null;
@@ -220,7 +251,7 @@
             if (type != null)
             {
                 if (type.isSimpleType ())
-                {        
+			{		//schema defined simpleType
                     baseTypeName = CUtils.getclass4qname (type.getBaseType ());
                     paraTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
                 }
@@ -228,12 +259,17 @@
                 {
                     paraTypeName = type.getLanguageSpecificName ();
                     if (CUtils.isSimpleType (paraTypeName))
-                        paraTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
-
+			    {
+			        paraTypeName =
+				    WrapperUtils.
+				    getClassNameFromParamInfoConsideringArrays
+				    (paramtype, wscontext);
+			    }
                     typeisarray = (paraTypeName.lastIndexOf ("_Array") > 0);
                     if (!typeisarray)
+			    {
                         paraTypeName = type.getLanguageSpecificName ();
-
+			    }
                     typeissimple = CUtils.isSimpleType (paraTypeName);
                 }
                 typeisarray |= type.isArray ();
@@ -246,11 +282,14 @@
             }
             
             if (baseTypeName == null)
+	    {
                 baseTypeName = paraTypeName;
-
+	    }
             typeissimple = CUtils.isSimpleType (baseTypeName);
             if (paramtype.getType().isAttachment())
+	    {
                 writer.write("ISoapAttachment *Value0");
+	    }
             else if (typeissimple
                     && (!(((ParameterInfo) paramsB.get (0)).isNillable () || ((ParameterInfo) paramsB.get (0)).isOptional())
                             || CUtils.isPointerType(baseTypeName)))
@@ -258,10 +297,13 @@
                 writer.write (paraTypeName + " Value0");
             }
             else if (paraTypeName.lastIndexOf ("*") > 0)
+	    {
                 writer.write (paraTypeName + " Value0");
-            else //for AnyType too
+	    }
+	    else
+	    {			//for AnyType too
                 writer.write (paraTypeName + "* Value0");
-
+	    }
             for (int i = 1; i < paramsB.size (); i++)
             {
                 baseTypeName = null;
@@ -278,13 +320,20 @@
                     {
                         paraTypeName = type.getLanguageSpecificName ();
                         if (CUtils.isSimpleType (paraTypeName))
-                            paraTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
-
-                        typeisarray = (paraTypeName.lastIndexOf ("_Array") > 0);
+				{
+				    paraTypeName =
+					WrapperUtils.
+					getClassNameFromParamInfoConsideringArrays
+					(paramtype, wscontext);
+				}
+				typeisarray =
+				    (paraTypeName.lastIndexOf ("_Array") > 0);
                         if (!typeisarray)
+				{
                             paraTypeName = type.getLanguageSpecificName ();       
-                    }
+				}
                     
+			    }
                     typeisarray |= type.isArray ();
                     typeissimple = CUtils.isSimpleType (paraTypeName);
                 }
@@ -296,26 +345,36 @@
                 }
                 
                 if (baseTypeName == null)
+			{
                     baseTypeName = paraTypeName;
-
+			}
                 typeissimple = CUtils.isSimpleType (baseTypeName);
                 if (paramtype.getType().isAttachment())
+	            {
                        writer.write(", ISoapAttachment *Value" + i);
+	            }
                 else if (typeissimple
                             && (!(((ParameterInfo) paramsB.get (i)).isNillable () 
                                     || ((ParameterInfo) paramsB.get (i)).isOptional())
                                         || CUtils.isPointerType(baseTypeName)))
+			{
                     writer.write (", " + paraTypeName + " Value" + i);
+			}
                 else if (paraTypeName.lastIndexOf ("*") > 0)
+			{
                     writer.write (", " + paraTypeName + " Value" + i);
-                else //for AnyType too
+			}
+			else
+			{		//for AnyType too
                     writer.write (", " + paraTypeName + "* Value" + i);
             } // end for loop
         } // end if (0 < paramsB.size ())
+	}
     
         // Multiples parameters so fill the methods prototype
         ArrayList paramsC = (ArrayList) minfo.getOutputParameterTypes ();
         if (isAllTreatedAsOutParams)
+	{
             for (int i = 0; i < paramsC.size (); i++)
             {
                 String baseTypeName = null;
@@ -324,14 +383,20 @@
                 ParameterInfo param = (ParameterInfo) paramsC.get (i);
                 String    paramType = WrapperUtils.getClassNameFromParamInfoConsideringArrays (param, wscontext);
                 if (type.isSimpleType())
+            {
                     baseTypeName = CUtils.getclass4qname(type.getBaseType());
+            }
                 else
+            {
                     baseTypeName = paramType;
+            }
                 
                 boolean bTypeHasStar = paramType.endsWith("*");
                 
                 if (paramsB.size()!=0 || 0!=i)
+            {
                     writer.write(", ");
+            }
                 
                 writer.write("AXIS_OUT_PARAM " + paramType);
                 if (CUtils.isSimpleType(baseTypeName))
@@ -339,20 +404,31 @@
                     if ((param.isOptional() || param.isNillable()) && !CUtils.isPointerType(baseTypeName))
                     {
                         if (bTypeHasStar)
+                    {
                             writer.write(" *");
+                    }
                         else
+                    {
                             writer.write(" **");
                     }
+                }
                     else if (CUtils.isPointerType(baseTypeName) || !bTypeHasStar)
+                {
                         writer.write(" *");
                 }
+                // Else we don't need to anymore '*'
+            }
                 else if(bTypeHasStar)
+            {
                     writer.write(" *");
+            }
                 else
+            {
                     writer.write(" **");
-                
+            }
                 writer.write(" OutValue" + i);
             } // end for-loop
+	}
     
         writer.write (")\n{\n");
         
@@ -361,24 +437,40 @@
             writer.write ("\t");
             
             if (returntypeisarray)
+	    {
+	        //for arrays
                 writer.write (outparamType + " * RetArray = new " + outparamType + "();\n");
-            else if (!returntypeissimple)
-            {        
-                //for AnyType too
+	    }
+	    else
+	    {
+		if (!returntypeissimple)
+		{		//for AnyType too
                 if (outparamType.lastIndexOf ("*") > 0)
+		    {
                     writer.write (outparamType + " pReturn = NULL;\n");
+		    }
                 else
                     writer.write (outparamType + "* pReturn = NULL;\n");
+		    //for complex types
             }
-            else if ((returntype.isNillable () || returntype.isOptional())
+		else
+		{
+		    //for simple types
+		    if ((returntype.isNillable () || returntype.isOptional())
                         && !(CUtils.isPointerType(outparamType)))
+		    {
                 writer.write (outparamType + "* Ret = NULL;\n");
+		    }
             else
             {
                 String initValue = CUtils.getInitValue (outparamType);
                 if (initValue != null)
+			{
                     writer.write (outparamType + " Ret = " + initValue + ";\n");
-                else if (outparamType.equals ("xsd__dateTime")
+			}
+			else
+			{
+				if (outparamType.equals ("xsd__dateTime")
                             || outparamType.equals ("xsd__date")
                             || outparamType.equals ("xsd__time"))
                 {
@@ -386,19 +478,30 @@
                     writer.write ("\tmemset(&Ret,0,sizeof(" + outparamType + "));\n");
                 }
                 else
+				{
                     writer.write (outparamType + " Ret;\n");
-            }
+				}
+			}
+		    }
+		}
             //TODO initialize return parameter appropriately.
         }
-        
+	}
         writer.write ("\tconst char* pcCmplxFaultName = NULL;\n");
         writer.write ("\ttry\n\t{\n");
     
         writer.write("\tif (AXIS_SUCCESS != m_pCall->initialize(CPP_DOC_PROVIDER" + ")) return ");
         if (returntype != null)
-            writer.write ((returntypeisarray ? "RetArray" : returntypeissimple ? "Ret" : "pReturn") + ";\n");
+	{
+	    writer.write ((returntypeisarray
+			   ? "RetArray"
+			   : returntypeissimple
+			   ? "Ret" : "pReturn") + ";\n\t");
+	}
         else
+	{
             writer.write (";\n");
+	}
         writer.write ("\n");
         
         writer.write ("\tif (NULL==m_pCall->getTransportProperty(\"SOAPAction\",false))\n");
@@ -643,8 +746,9 @@
                 }
                 
                 if (baseTypeName == null)
+			{
                     baseTypeName = currentParaType;
-
+			}
                 typeissimple = CUtils.isSimpleType (baseTypeName);
                 currentParamName = "*OutValue" + i;
                 
@@ -653,10 +757,13 @@
                 {
                     QName qname = null;
                     if (WrapperUtils.getArrayType (type) != null)
+			    {
                         qname = WrapperUtils.getArrayType (type).getName ();
+			    }
                     else
+			    {
                         qname = type.getName ();
-                    
+			    }
                     String containedType = null;
                     
                     if (CUtils.isSimpleType (qname))
@@ -715,7 +822,9 @@
                 else if (typeissimple)
                 {
                     if( i > 0)
+			        {
                         writer.write( "\n");
+			        }
                     
                     if (CUtils.isPointerType(baseTypeName))
                     {
@@ -724,8 +833,9 @@
                         if( !CUtils.isPointerType(baseTypeName))
                         {
                             if (!baseTypeName.equals(currentParaType))
+					        {
                                 xsdType = currentParaType;
-
+					        }
                             xsdType += " *";
                         }
                         
@@ -789,8 +899,9 @@
                 {
                     int lastIndexOfStar = currentParaType.lastIndexOf("*");
                     if (lastIndexOfStar > 0)
+				    {
                         currentParaType = currentParaType.substring(0, lastIndexOfStar);
-
+				    }
                     writer.write ("\n\t\t\t"
                               + currentParamName + " = (" + currentParaType
                               + "*)m_pCall->getCmplxObject((void*) Axis_DeSerialize_" + currentParaType 
@@ -807,8 +918,9 @@
         else if (returntype == null)
         {
             if (minfo.getOutputMessage () != null)
+		{
                 writer.write ("\t\t\t/*not successful*/\n\t\t}\n");
-
+		}
             writer.write ("\t}\n");
             writer.write ("\tm_pCall->unInitialize();\n");
         }
@@ -1141,14 +1253,17 @@
             {
                 type = (Type) types.next();
                 if (type.isSimpleType())
+		{
                     continue;
-
+		}
                 if (type.isArray())
+		{
                     continue;
-
+		}
                 if (type.isAnonymous() && !type.isExternalized())
+		{
                     continue;
-
+		}
                 typeSet.add(type.getLanguageSpecificName());
             }
             

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java?view=diff&rev=446633&r1=446632&r2=446633
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java Fri Sep 15 08:29:12 2006
@@ -105,6 +105,13 @@
 
     /* Should this type be generated or not - by default, set to true except for anonymous types */
     private boolean externalize = true;
+
+    // vvv FJP - 17667
+    private boolean	restriction = false;
+    private String  restrictionBase = null;
+    private Vector  restrictionPattern = null;
+    private Vector  restrictionEnumeration = null;
+    // ^^^ FJP - 17667
     
     /* Is anonymous type? qname.localname is checked, and if starts with '>', then true */
     private boolean isAnonymous = false;
@@ -527,4 +534,62 @@
         if (type != null && !TypeMap.isSimpleType(type.getName()))
             this.vRelatedTypes.add(type);
     }    
+    // vvv FJP - 17667
+    /**
+     * @return Returns the restrictionBase.
+     */
+    public String getRestrictionBase()
+    {
+        return restrictionBase;
+    }
+    /**
+     * @param restrictionBase The restrictionBase to set.
+     */
+    public void setRestrictionBase(String restrictionBase)
+    {
+        this.restrictionBase = restrictionBase;
+    }
+    /**
+     * @return Returns the restrictionEnumeration.
+     */
+    public Vector getRestrictionEnumeration()
+    {
+        return restrictionEnumeration;
+    }
+    /**
+     * @param restrictionEnumeration The restrictionEnumeration to set.
+     */
+    public void setRestrictionEnumeration(Vector restrictionEnumeration)
+    {
+        this.restrictionEnumeration = restrictionEnumeration;
+    }
+    /**
+     * @return Returns the restrictionPattern.
+     */
+    public Vector getRestrictionPattern()
+    {
+        return restrictionPattern;
+    }
+    /**
+     * @param restrictionPattern The restrictionPattern to set.
+     */
+    public void setRestrictionPattern(Vector restrictionPattern)
+    {
+        this.restrictionPattern = restrictionPattern;
+    }
+    /**
+     * @return Returns the restriction.
+     */
+    public boolean isRestriction()
+    {
+        return restriction;
+    }
+    /**
+     * @param restriction The restriction to set.
+     */
+    public void setRestriction(boolean restriction)
+    {
+        this.restriction = restriction;
+    }
+    // ^^^ FJP - 17667
 }



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