axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r688130 [1/7] - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/ c/literal/ cpp/ cpp/literal/
Date Fri, 22 Aug 2008 17:37:40 GMT
Author: nadiramra
Date: Fri Aug 22 10:37:39 2008
New Revision: 688130

URL: http://svn.apache.org/viewvc?rev=688130&view=rev
Log:
Some refactoring...renaming of variables.

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/BasicFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.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/CPPClassWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.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/ServiceHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.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/cpp/literal/ServiceHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/BasicFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/BasicFileWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/BasicFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/BasicFileWriter.java Fri Aug 22 10:37:39 2008
@@ -28,19 +28,25 @@
 import org.apache.axis.wsdl.wsdl2ws.SourceWriter;
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
 
-public abstract class BasicFileWriter implements SourceWriter{
-	protected String classname;
-	protected BufferedWriter writer;
+/**
+ * Basic file writer.
+ *
+ */
+public abstract class BasicFileWriter implements SourceWriter
+{
+	protected String c_classname;
+	protected String c_fileExtension;
+	protected BufferedWriter c_writer;
 	public BasicFileWriter(String classname)throws WrapperFault{
-		this.classname = classname;
+		c_classname = classname;
 	}
 	public abstract void writeSource()throws WrapperFault;
-	protected void writeClassComment()throws WrapperFault{}
-	protected void writePreprocessorStatements()throws WrapperFault{}
-	protected void writeAttributes()throws WrapperFault{}
-	protected void writeConstructors()throws WrapperFault {};
-	protected void writeDestructors()throws WrapperFault {};
-	protected abstract void writeMethods()throws WrapperFault;
+	protected void writeClassComment() throws WrapperFault {}
+	protected void writePreprocessorStatements() throws WrapperFault {}
+	protected void writeAttributes() throws WrapperFault {}
+	protected void writeConstructors() throws WrapperFault {};
+	protected void writeDestructors() throws WrapperFault {};
+	protected abstract void writeMethods() throws WrapperFault;
 	protected File getFilePath() throws WrapperFault
 	{
 	    return getFilePath(false);

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java Fri Aug 22 10:37:39 2008
@@ -62,24 +62,24 @@
     {
         try
         {
-            writer.write("/*\n");
-            writer.write(" * Copyright 2003-2006 The Apache Software Foundation.\n\n");
-            writer.write(" *\n");
-            writer.write(" * Licensed under the Apache License, Version 2.0 (the \"License\");\n");
-            writer.write(" * you may not use this file except in compliance with the License.\n");
-            writer.write(" * You may obtain a copy of the License at\n");
-            writer.write(" *\n");
-            writer.write(" *\t\thttp://www.apache.org/licenses/LICENSE-2.0\n");
-            writer.write(" *\n");
-            writer.write(" * Unless required by applicable law or agreed to in writing, software\n");
-            writer.write(" * distributed under the License is distributed on an \"AS IS\" BASIS,\n");
-            writer.write(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n");
-            writer.write(" * See the License for the specific language governing permissions and\n");
-            writer.write(" * limitations under the License.\n");
-            writer.write(" *\n");
-            writer.write(" * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)\n");
-            writer.write(" * This file contains functions to manipulate type " + this.classname + "\n");
-            writer.write(" */\n\n");
+            c_writer.write("/*\n");
+            c_writer.write(" * Copyright 2003-2006 The Apache Software Foundation.\n\n");
+            c_writer.write(" *\n");
+            c_writer.write(" * Licensed under the Apache License, Version 2.0 (the \"License\");\n");
+            c_writer.write(" * you may not use this file except in compliance with the License.\n");
+            c_writer.write(" * You may obtain a copy of the License at\n");
+            c_writer.write(" *\n");
+            c_writer.write(" *\t\thttp://www.apache.org/licenses/LICENSE-2.0\n");
+            c_writer.write(" *\n");
+            c_writer.write(" * Unless required by applicable law or agreed to in writing, software\n");
+            c_writer.write(" * distributed under the License is distributed on an \"AS IS\" BASIS,\n");
+            c_writer.write(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n");
+            c_writer.write(" * See the License for the specific language governing permissions and\n");
+            c_writer.write(" * limitations under the License.\n");
+            c_writer.write(" *\n");
+            c_writer.write(" * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)\n");
+            c_writer.write(" * This file contains functions to manipulate type " + this.c_classname + "\n");
+            c_writer.write(" */\n\n");
         }
         catch (IOException e)
         {

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java Fri Aug 22 10:37:39 2008
@@ -49,30 +49,30 @@
     {
         try
         {
-            this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
+            c_writer = new BufferedWriter(new FileWriter(getFilePath(), false));
             writeClassComment();
 
-            this.writer.write("#if !defined(__"  + classname.toUpperCase() + "_H__INCLUDED_)\n");
-            this.writer.write("#define __" + classname.toUpperCase() + "_H__INCLUDED_\n\n");
+            c_writer.write("#if !defined(__"  + c_classname.toUpperCase() + "_H__INCLUDED_)\n");
+            c_writer.write("#define __" + c_classname.toUpperCase() + "_H__INCLUDED_\n\n");
                         
             if (attribs.length != 1)
             {
-                System.out.println("Array " + classname + " contains unexpected no of variables");
-                throw new WrapperFault("Array type " + classname + " contain unexpected no of types");
+                System.out.println("Array " + c_classname + " contains unexpected no of variables");
+                throw new WrapperFault("Array type " + c_classname + " contain unexpected no of types");
             }
                       
-            writer.write("#include <axis/Axis.h>\n");
-            writer.write("#include <axis/AxisUserAPI.h>\n\n");
+            c_writer.write("#include <axis/Axis.h>\n");
+            c_writer.write("#include <axis/AxisUserAPI.h>\n\n");
 
-            this.writer.write("#ifdef __cplusplus\n extern \"C\" {\n#endif\n\n");
+            c_writer.write("#ifdef __cplusplus\n extern \"C\" {\n#endif\n\n");
             
             writeArrayClassDefinition();
             
-            this.writer.write("\n#ifdef __cplusplus\n }\n#endif\n\n");
-            this.writer.write("#endif /* !defined(__" + classname.toUpperCase() + "_H__INCLUDED_)*/\n");
+            c_writer.write("\n#ifdef __cplusplus\n }\n#endif\n\n");
+            c_writer.write("#endif /* !defined(__" + c_classname.toUpperCase() + "_H__INCLUDED_)*/\n");
             
-            writer.flush();
-            writer.close();
+            c_writer.flush();
+            c_writer.close();
             if (WSDL2Ws.c_verbose)
                 System.out.println(getFilePath().getAbsolutePath() + " created.....");
         }
@@ -93,13 +93,13 @@
         String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
         new File(targetOutputLocation).mkdirs();
 
-        String fileName = targetOutputLocation + "/" + classname + CUtils.getHeaderFileExtension();
+        String fileName = targetOutputLocation + "/" + c_classname + CUtils.getHeaderFileExtension();
 
         if (useServiceName)
         {
             fileName =  targetOutputLocation + "/"
                     + this.wscontext.getServiceInfo().getServicename()
-                    + "_" + classname + CUtils.getHeaderFileExtension();
+                    + "_" + c_classname + CUtils.getHeaderFileExtension();
         }
 
         return new File(fileName);
@@ -109,23 +109,23 @@
     {
         try
         {
-            writer.write("\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("/* --- Array type                                                    --- */\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("\n");                
+            c_writer.write("\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("/* --- Array type                                                    --- */\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("\n");                
             
-            writer.write("typedef struct " + classname + "Tag {\n"
+            c_writer.write("typedef struct " + c_classname + "Tag {\n"
                        + "\tstruct " + attribs[0].getTypeName() + "Tag **   m_Array;\n"
                        + "\tint   m_Size;\n"
                        + "\tAXISC_XSDTYPE   m_Type;\n"
-                       + "} " + classname + ";\n"); 
+                       + "} " + c_classname + ";\n"); 
             
-            writer.write("\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("/* --- Functions to create/delete array type                         --- */\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("\n");                
+            c_writer.write("\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("/* --- Functions to create/delete array type                         --- */\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("\n");                
 
             this.writeConstructors();
             this.writeDestructors();
@@ -140,7 +140,7 @@
     {
         try
         {
-            this.writer.write("extern void* Axis_Create_" + classname + "(int nSize);\n");
+            c_writer.write("extern void* Axis_Create_" + c_classname + "(int nSize);\n");
         }
         catch (IOException e)
         {
@@ -153,8 +153,8 @@
     {
         try
         {
-            this.writer.write("extern void Axis_Delete_" + classname 
-                    + "(" + classname + "* param, int nSize);\n");
+            c_writer.write("extern void Axis_Delete_" + c_classname 
+                    + "(" + c_classname + "* param, int nSize);\n");
         }
         catch (IOException e)
         {

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java Fri Aug 22 10:37:39 2008
@@ -57,38 +57,38 @@
     {
         try
         {
-            this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
+            c_writer = new BufferedWriter(new FileWriter(getFilePath(), false));
             
             // Write prolog
             writeClassComment(); 
 
             // include system header files
-            writer.write("#include <stdlib.h>\n");
-            writer.write("#include <stdio.h>\n");
-            writer.write("#include <string.h>\n");
-            writer.write("\n");
+            c_writer.write("#include <stdlib.h>\n");
+            c_writer.write("#include <stdio.h>\n");
+            c_writer.write("#include <string.h>\n");
+            c_writer.write("\n");
             
             // include header file for datatype
-            writer.write("#include \"" + classname + ".h\"\n");
+            c_writer.write("#include \"" + c_classname + ".h\"\n");
             
             // include header file for the contained type
             QName qname = CUtils.getArrayType(type).getName();
             if (!CUtils.isSimpleType(qname))
-                writer.write("#include \"" + attribs[0].getTypeName() + CUtils.getHeaderFileExtension() + "\"\n");
-            this.writer.write("\n");
+                c_writer.write("#include \"" + attribs[0].getTypeName() + CUtils.getHeaderFileExtension() + "\"\n");
+            c_writer.write("\n");
             
-            writer.write("\n");
-            writer.write("#include <axis/AxisWrapperAPI.h>\n");
-            writer.write("#include <axis/IWrapperSoapSerializer.h>\n");
-            writer.write("#include <axis/IWrapperSoapDeSerializer.h>\n");
-            writer.write("#include <axis/client/Stub.h>\n");
-            writer.write("#include <axis/client/Call.h>\n");
-            writer.write("\n");
+            c_writer.write("\n");
+            c_writer.write("#include <axis/AxisWrapperAPI.h>\n");
+            c_writer.write("#include <axis/IWrapperSoapSerializer.h>\n");
+            c_writer.write("#include <axis/IWrapperSoapDeSerializer.h>\n");
+            c_writer.write("#include <axis/client/Stub.h>\n");
+            c_writer.write("#include <axis/client/Call.h>\n");
+            c_writer.write("\n");
             
             this.writeMethods();
             
-            writer.flush();
-            writer.close();
+            c_writer.flush();
+            c_writer.close();
             if (WSDL2Ws.c_verbose)
                 System.out.println(getFilePath().getAbsolutePath() + " created.....");
         }
@@ -139,24 +139,24 @@
     {
         try
         {
-            CUtils.printMethodComment(writer, "Function used to create objects of type " 
-                    + classname + ".");
+            CUtils.printMethodComment(c_writer, "Function used to create objects of type " 
+                    + c_classname + ".");
             
-            writer.write("extern void* Axis_Create_" + classname + "(int nSize)\n");
-            writer.write("{\n");
+            c_writer.write("extern void* Axis_Create_" + c_classname + "(int nSize)\n");
+            c_writer.write("{\n");
             
             // Begin function body
 
-            writer.write("\t/* Create array data type */\n");
-            writer.write("\t" + classname + " *pArray = (" + classname + "*)axiscAxisNew(XSDC_ARRAY, 0);\n");
-            writer.write("\tpArray->m_Type = C_USER_TYPE;\n");
-            writer.write("\n");
+            c_writer.write("\t/* Create array data type */\n");
+            c_writer.write("\t" + c_classname + " *pArray = (" + c_classname + "*)axiscAxisNew(XSDC_ARRAY, 0);\n");
+            c_writer.write("\tpArray->m_Type = C_USER_TYPE;\n");
+            c_writer.write("\n");
 
-            writer.write("\treturn pArray;\n");
+            c_writer.write("\treturn pArray;\n");
             
             // End function body
 
-            writer.write("}\n");
+            c_writer.write("}\n");
         }
         catch (IOException e)
         {
@@ -169,35 +169,35 @@
     {
         try
         {
-            CUtils.printMethodComment(writer, "Function used to delete objects of type " 
-                    + classname + ".");
+            CUtils.printMethodComment(c_writer, "Function used to delete objects of type " 
+                    + c_classname + ".");
             
-            this.writer.write("extern void Axis_Delete_" + classname 
-                    + "(" + classname + "* param, int nSize)\n");
-            writer.write("{\n");
+            c_writer.write("extern void Axis_Delete_" + c_classname 
+                    + "(" + c_classname + "* param, int nSize)\n");
+            c_writer.write("{\n");
             
             // Begin function body
             
-            writer.write("\t/* If null, simply return */\n");
-            writer.write("\tif (param == NULL)\n");
-            writer.write("\t\treturn;\n");
-            writer.write("\n");
-            
-            writer.write("\t/* Reclaim memory resources of array elements, if it exists */\n");
-            writer.write("\tif (param->m_Array && param->m_Size > 0)\n");
-            writer.write("\t{\n");            
-            writer.write("\t\tAxis_Delete_" +  attribs[0].getTypeName() 
+            c_writer.write("\t/* If null, simply return */\n");
+            c_writer.write("\tif (param == NULL)\n");
+            c_writer.write("\t\treturn;\n");
+            c_writer.write("\n");
+            
+            c_writer.write("\t/* Reclaim memory resources of array elements, if it exists */\n");
+            c_writer.write("\tif (param->m_Array && param->m_Size > 0)\n");
+            c_writer.write("\t{\n");            
+            c_writer.write("\t\tAxis_Delete_" +  attribs[0].getTypeName() 
                     + "((" + attribs[0].getTypeName() + " *)param->m_Array, param->m_Size);\n");
-            writer.write("\t\tparam->m_Array = NULL;\n");            
-            writer.write("\t}\n");                     
-            writer.write("\n");
+            c_writer.write("\t\tparam->m_Array = NULL;\n");            
+            c_writer.write("\t}\n");                     
+            c_writer.write("\n");
             
-            writer.write("\t/* Reclaim array data type memory resources */\n");
-            writer.write("\taxiscAxisDelete(param, XSDC_ARRAY);\n");
+            c_writer.write("\t/* Reclaim array data type memory resources */\n");
+            c_writer.write("\taxiscAxisDelete(param, XSDC_ARRAY);\n");
             
             // End function body            
             
-            writer.write("}\n");
+            c_writer.write("}\n");
         }
         catch (IOException e)
         {
@@ -213,7 +213,7 @@
         String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
         new File(targetOutputLocation).mkdirs();
 
-        String fileName = targetOutputLocation + "/" + classname + CUtils.getImplFileExtension();
+        String fileName = targetOutputLocation + "/" + c_classname + CUtils.getImplFileExtension();
 
         return new File(fileName);
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Fri Aug 22 10:37:39 2008
@@ -67,16 +67,16 @@
         // TODO: xsd:extension not fully or correctly supported.
         if (extensionBaseAttrib != null)
         {
-            CUtils.printBlockComment(writer, "Serialize extension.");
+            CUtils.printBlockComment(c_writer, "Serialize extension.");
             
             String typeName = extensionBaseAttrib.getTypeName(); 
 
             if (extensionBaseAttrib.isSimpleType())
             {
-                writer.write("\taxiscSoapSerializerSerializeAsChardata(pSZ,(void*)");                
+                c_writer.write("\taxiscSoapSerializerSerializeAsChardata(pSZ,(void*)");                
                 if (!CUtils.isPointerType(typeName))
-                    writer.write("&");                
-                writer.write("(param->" + extensionBaseAttrib.getParamNameAsMember() + "), "
+                    c_writer.write("&");                
+                c_writer.write("(param->" + extensionBaseAttrib.getParamNameAsMember() + "), "
                         + CUtils.getXSDEnumeratorForType(typeName) + ");\n");
             }
             else
@@ -86,19 +86,19 @@
         }        
         else if (attribs.length == 0)
         {
-            System.out.println("Possible error in class " + classname
+            System.out.println("Possible error in class " + c_classname
                     + ": class with no attributes or elements...........");
         }        
     }
     
     private void writeSerializeGlobalMethod() throws IOException, WrapperFault
     {
-        CUtils.printMethodComment(writer, "Function to serialize an object of type "  
-                + classname + ".");  
+        CUtils.printMethodComment(c_writer, "Function to serialize an object of type "  
+                + c_classname + ".");  
         
-        writer.write("int Axis_Serialize_" + classname
-                + "(" + classname + "* param, AXISCHANDLE pSZ, AxiscBool bArray)\n");
-        writer.write( "{\n");
+        c_writer.write("int Axis_Serialize_" + c_classname
+                + "(" + c_classname + "* param, AXISCHANDLE pSZ, AxiscBool bArray)\n");
+        c_writer.write( "{\n");
         
         //=============================================================================
         // No attributes or elements to serialize? Then serialize extension and return.
@@ -106,14 +106,14 @@
 
         if (attribs.length == 0)
         {
-            CUtils.printBlockComment(writer, "No attributes or elements to serialize.");
+            CUtils.printBlockComment(c_writer, "No attributes or elements to serialize.");
         
-            writer.write("\taxiscSoapSerializerSerialize(pSZ,\">\", NULL);\n");
+            c_writer.write("\taxiscSoapSerializerSerialize(pSZ,\">\", NULL);\n");
 
             writeSerializeExtensionCode();
             
-            writer.write("\treturn AXISC_SUCCESS;\n");
-            writer.write("}\n");
+            c_writer.write("\treturn AXISC_SUCCESS;\n");
+            c_writer.write("}\n");
             return;
         }
         
@@ -123,16 +123,16 @@
         // to put this, or we need to find a way to determine if nillable.
         //=============================================================================        
         
-        writer.write("\tAxiscBool blnIsNewPrefix = xsdc_boolean_false;\n\n");
+        c_writer.write("\tAxiscBool blnIsNewPrefix = xsdc_boolean_false;\n\n");
 
-        CUtils.printBlockComment(writer, "If null input, serialize as nil element.");
+        CUtils.printBlockComment(c_writer, "If null input, serialize as nil element.");
         
-        writer.write("\tif ( param == NULL )\n\t{\n");
-        writer.write("\t\taxiscSoapSerializerSerializeAsAttribute(pSZ, \"xsi:nil\", 0, (void*)&(xsdc_boolean_true), XSDC_BOOLEAN);\n");
+        c_writer.write("\tif ( param == NULL )\n\t{\n");
+        c_writer.write("\t\taxiscSoapSerializerSerializeAsAttribute(pSZ, \"xsi:nil\", 0, (void*)&(xsdc_boolean_true), XSDC_BOOLEAN);\n");
 
-        writer.write("\t\taxiscSoapSerializerSerialize(pSZ, \">\", NULL);\n");
-        writer.write("\t\treturn AXISC_SUCCESS;\n");
-        writer.write("\t}\n");
+        c_writer.write("\t\taxiscSoapSerializerSerialize(pSZ, \">\", NULL);\n");
+        c_writer.write("\t\treturn AXISC_SUCCESS;\n");
+        c_writer.write("\t}\n");
         
         //=============================================================================
         // Serialize 
@@ -150,7 +150,7 @@
         //=============================================================================        
 
         if (attributeParamCount > 0)
-            CUtils.printBlockComment(writer, "Serialize attributes.");
+            CUtils.printBlockComment(c_writer, "Serialize attributes.");
         
         for (int i = 0; i < attributeParamCount; i++)
         {            
@@ -168,15 +168,15 @@
             if (CUtils.isPointerType(basicType) || attribs[i].isOptional())
             {
                 // TODO: Add check if ptr type and not optional and is null, throw exception.
-                writer.write("\tif (0 != param->" + attribs[i].getParamNameAsMember() + ")\n\t");
-                writer.write("\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
+                c_writer.write("\tif (0 != param->" + attribs[i].getParamNameAsMember() + ")\n\t");
+                c_writer.write("\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
                         + attribs[i].getParamNameAsSOAPString() + "\", 0, (void*)(param->"
                         + attribs[i].getParamNameAsMember() + "), "
                         + CUtils.getXSDEnumeratorForType(basicType) + ");\n");
             }
             else
             {
-                writer.write("\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
+                c_writer.write("\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
                         + attribs[i].getParamNameAsSOAPString() + "\", 0, (void*)&(param->"
                         + attribs[i].getParamNameAsMember() + "), "
                         + CUtils.getXSDEnumeratorForType(attribs[i].getTypeName()) + ");\n");
@@ -189,17 +189,17 @@
                         
         if (type.isFault())
         {
-            writer.write("\tif(Axis_URI_" + classname + ")\n\t{\n");
-            writer.write("\t\tAxiscBool blnIsNewPrefix = xsdc_boolean_false;\n");
-            writer.write("\t\tconst AxiscChar* sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ,Axis_URI_"
-                        + classname + ", &blnIsNewPrefix);\n");
-            writer.write("\t\taxiscSoapSerializerSerialize(pSZ, \" xmlns:\", sPrefix, \"=\\\"\",");
-            writer.write("Axis_URI_" + classname + ", \" " + " \\\"\"");
-            writer.write(", NULL);\n\t}\n");
+            c_writer.write("\tif(Axis_URI_" + c_classname + ")\n\t{\n");
+            c_writer.write("\t\tAxiscBool blnIsNewPrefix = xsdc_boolean_false;\n");
+            c_writer.write("\t\tconst AxiscChar* sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ,Axis_URI_"
+                        + c_classname + ", &blnIsNewPrefix);\n");
+            c_writer.write("\t\taxiscSoapSerializerSerialize(pSZ, \" xmlns:\", sPrefix, \"=\\\"\",");
+            c_writer.write("Axis_URI_" + c_classname + ", \" " + " \\\"\"");
+            c_writer.write(", NULL);\n\t}\n");
         }               
         
         if (wscontext.getWrapperInfo().getBindingStyle().equals("document"))
-            writer.write("\taxiscSoapSerializerSerialize(pSZ, \">\", 0);\n");
+            c_writer.write("\taxiscSoapSerializerSerialize(pSZ, \">\", 0);\n");
         
         //=============================================================================
         // Serialize extension, if any
@@ -212,7 +212,7 @@
         //=============================================================================    
         
         if (attributeParamCount < attribs.length)
-            CUtils.printBlockComment(writer, "Serialize sub-elements.");
+            CUtils.printBlockComment(c_writer, "Serialize sub-elements.");
 
         boolean firstIfWritten = false;
         int anyCounter = 0; //counter for any types.
@@ -222,7 +222,7 @@
         {
             String namespace = "NULL";
             if (attribs[i].getNsQualified())
-                namespace = "Axis_URI_" + classname;
+                namespace = "Axis_URI_" + c_classname;
             
             // if the attribute is a choice following should do
             boolean ifCheckPrinted = false;
@@ -230,14 +230,14 @@
             {
                 if (!firstIfWritten)
                 {
-                    writer.write("\tif");
+                    c_writer.write("\tif");
                     firstIfWritten = true;
                 } 
                 else
-                    writer.write("\telse if");
+                    c_writer.write("\telse if");
 
                 ifCheckPrinted = true;
-                writer.write("(param->" + attribs[i].getParamNameAsMember() + ")\n\t{\n\t");
+                c_writer.write("(param->" + attribs[i].getParamNameAsMember() + ")\n\t{\n\t");
             }
             else
                 firstIfWritten = false;
@@ -247,7 +247,7 @@
                 if (attribs[i].getMinOccurs() == 0)
                 {
                     ifCheckPrinted = true;
-                    writer.write("\tif(param->" + attribs[i].getParamNameAsMember() + ")\n\t{\n\t");
+                    c_writer.write("\tif(param->" + attribs[i].getParamNameAsMember() + ")\n\t{\n\t");
                 }
              
             if (attribs[i].isAnyType())
@@ -255,9 +255,9 @@
                 anyCounter += 1;
                 
                 if (attribs[i].isOptional())
-                    writer.write("\tif (param->any" + Integer.toString(anyCounter) + " != NULL)\n");
+                    c_writer.write("\tif (param->any" + Integer.toString(anyCounter) + " != NULL)\n");
                                           
-                writer.write("\t\taxiscSoapSerializerSerializeAnyObject(pSZ, param->any" + Integer.toString(anyCounter) +");\n");
+                c_writer.write("\t\taxiscSoapSerializerSerializeAnyObject(pSZ, param->any" + Integer.toString(anyCounter) +");\n");
             } 
             else if (attribs[i].isArray())
             {
@@ -269,7 +269,7 @@
                     else
                         baseTypeName = attribs[i].getTypeName();
                     
-                    writer.write("\taxiscSoapSerializerSerializeBasicArray(pSZ, (const Axisc_Array *)param->" + attribs[i].getParamNameAsMember()
+                    c_writer.write("\taxiscSoapSerializerSerializeBasicArray(pSZ, (const Axisc_Array *)param->" + attribs[i].getParamNameAsMember()
                         + ", " + namespace + ","
                         + CUtils.getXSDEnumeratorForType(baseTypeName) + ", \""
                         + attribs[i].getParamNameAsSOAPString() + "\");\n");
@@ -283,7 +283,7 @@
                     else
                         namespace = "NULL";
                     
-                    writer.write("\taxiscSoapSerializerSerializeCmplxArray(pSZ, (const Axisc_Array *)param->"
+                    c_writer.write("\taxiscSoapSerializerSerializeCmplxArray(pSZ, (const Axisc_Array *)param->"
                             + attribs[i].getParamNameAsMember() 
                             + ", (void*)Axis_Serialize_" + arrayType 
                             + ", (void*)Axis_Delete_" + arrayType 
@@ -300,7 +300,7 @@
                     baseTypeName = typeName;
                 
                 if (!ifCheckPrinted && attribs[i].isOptional())
-                    writer.write("\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n\t");
+                    c_writer.write("\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n\t");
                 
                 // If the simple type is a choice it is handled
                 // as a pointer variable.  This is the same in 'all' element and nillable elements.
@@ -311,7 +311,7 @@
                             || isElementNillable(i) || isElementOptional(i))
                     ampersand = "";
                 
-                writer.write("\taxiscSoapSerializerSerializeAsElement(pSZ, \""
+                c_writer.write("\taxiscSoapSerializerSerializeAsElement(pSZ, \""
                         + attribs[i].getElementNameAsSOAPString() + "\", " + namespace
                         + ", (void*)" + ampersand + "(param->" + attribs[i].getParamNameAsMember() + "), "
                         + CUtils.getXSDEnumeratorForType(baseTypeName) + ");\n");
@@ -329,36 +329,36 @@
                 else if (attribs[i].isOptional())
                 {
                     tab = "\t";
-                    writer.write("\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n\t{\n\t");
+                    c_writer.write("\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n\t{\n\t");
                 }
                 
                 if (attribs[i].getNsQualified())
                 {
-                    writer.write("\taxiscSoapSerializerSerialize(pSZ, \"<\", axiscSoapSerializerGetNamespacePrefix(pSZ, \""
+                    c_writer.write("\taxiscSoapSerializerSerialize(pSZ, \"<\", axiscSoapSerializerGetNamespacePrefix(pSZ, \""
                                     + type.getName().getNamespaceURI()
                                     + "\", NULL), \":\", \"" + elm + "\", 0);\n");
-                    writer.write(tab + "\tAxis_Serialize_" + attribs[i].getTypeName()
+                    c_writer.write(tab + "\tAxis_Serialize_" + attribs[i].getTypeName()
                             + "(param->" + attribs[i].getParamNameAsMember() + ", pSZ, 0);\n");
-                    writer.write(tab + "\taxiscSoapSerializerSerialize(pSZ, \"</\", axiscSoapSerializerGetNamespacePrefix(pSZ, \""
+                    c_writer.write(tab + "\taxiscSoapSerializerSerialize(pSZ, \"</\", axiscSoapSerializerGetNamespacePrefix(pSZ, \""
                                     + type.getName().getNamespaceURI()
                                     + "\", NULL), \":\", \"" + elm + "\", \">\", 0);\n");
                 }
                 else
                 {
-                    writer.write("\taxiscSoapSerializerSerialize(pSZ, \"<" + elm + "\", 0);\n");
-                    writer.write(tab + "\tAxis_Serialize_" + attribs[i].getTypeName()
+                    c_writer.write("\taxiscSoapSerializerSerialize(pSZ, \"<" + elm + "\", 0);\n");
+                    c_writer.write(tab + "\tAxis_Serialize_" + attribs[i].getTypeName()
                             + "(param->" + attribs[i].getParamNameAsMember() + ", pSZ, 0);\n");
-                    writer.write(tab + "\taxiscSoapSerializerSerialize(pSZ, \"</" + elm + "\", \">\", 0);\n");
+                    c_writer.write(tab + "\taxiscSoapSerializerSerialize(pSZ, \"</" + elm + "\", \">\", 0);\n");
                 }
                 
                 if (!ifCheckPrinted && attribs[i].isOptional())
-                    writer.write("\t}\n");
+                    c_writer.write("\t}\n");
             }
 
             //end if choice element
 
             if (ifCheckPrinted)
-                writer.write("\t}\n");
+                c_writer.write("\t}\n");
         }
         
         //=============================================================================
@@ -367,18 +367,18 @@
                 
         if (wscontext.getWrapperInfo().getBindingStyle().equals("rpc"))
         {
-            writer.write("\n\taxiscSoapSerializerSerialize(pSZ, \"</\", Axis_TypeName_" + classname
+            c_writer.write("\n\taxiscSoapSerializerSerialize(pSZ, \"</\", Axis_TypeName_" + c_classname
                     + ", \">\", NULL);\n");
         }
 
-        CUtils.printBlockComment(writer, "Remove namespace, if new.");        
+        CUtils.printBlockComment(c_writer, "Remove namespace, if new.");        
         
-        writer.write("\tif (!bArray && blnIsNewPrefix)\n");
-        writer.write("\t\taxiscSoapSerializerRemoveNamespacePrefix(pSZ, Axis_URI_" + classname + ");\n");
-        writer.write("\n");
+        c_writer.write("\tif (!bArray && blnIsNewPrefix)\n");
+        c_writer.write("\t\taxiscSoapSerializerRemoveNamespacePrefix(pSZ, Axis_URI_" + c_classname + ");\n");
+        c_writer.write("\n");
         
-        writer.write("\treturn AXISC_SUCCESS;\n");
-        writer.write("}\n");
+        c_writer.write("\treturn AXISC_SUCCESS;\n");
+        c_writer.write("}\n");
     }
 
     /**
@@ -386,15 +386,15 @@
      */
     private void writeDOCArrayPortionOfSerializeGlobalMethod() throws IOException
     {
-        CUtils.printBlockComment(writer, "Serialize top-most element, possibly defining new namespace.");        
+        CUtils.printBlockComment(c_writer, "Serialize top-most element, possibly defining new namespace.");        
         
         // For doc/literal objects
-        writer.write("\tif (!bArray)\n\t{\n");
-        writer.write("\t\tconst AxiscChar* sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ,Axis_URI_" + classname + ", &blnIsNewPrefix);\n");
-        writer.write("\t\tif (blnIsNewPrefix)\n");
-        writer.write("\t\t\taxiscSoapSerializerSerialize(pSZ,\" xmlns:\", sPrefix, \"=\\\"\", " 
-                        + "Axis_URI_" + classname + ", \"\\\"\", NULL);\n");
-        writer.write("\t}\n");
+        c_writer.write("\tif (!bArray)\n\t{\n");
+        c_writer.write("\t\tconst AxiscChar* sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ,Axis_URI_" + c_classname + ", &blnIsNewPrefix);\n");
+        c_writer.write("\t\tif (blnIsNewPrefix)\n");
+        c_writer.write("\t\t\taxiscSoapSerializerSerialize(pSZ,\" xmlns:\", sPrefix, \"=\\\"\", " 
+                        + "Axis_URI_" + c_classname + ", \"\\\"\", NULL);\n");
+        c_writer.write("\t}\n");
     }
 
     /**
@@ -403,24 +403,24 @@
     private void writeRPCArrayPortionOfSerializeGlobalMethod() throws IOException
     {
         // For rpc/encoded objects
-        writer.write( "\tif( bArray)\n");
-        writer.write( "\t\taxiscSoapSerializerSerialize(pSZ, \"<\", Axis_TypeName_" + classname + ", \">\", NULL);\n");
-        writer.write( "\telse\n");
-        writer.write( "\t{\n");
-        writer.write( "\t\tconst AxiscChar * sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ, Axis_URI_" 
-                + classname + ", &blnIsNewPrefix);\n\n");
-        writer.write( "\t\t// If there are objects that require a local namespace, then define it here.\n");
-        writer.write( "\t\t// NB: This namespace will go out of scope when the closing tag is reached.\n");
-        writer.write( "\t\tif( !blnIsNewPrefix)\n");
-        writer.write( "\t\t\taxiscSoapSerializerSerialize(pSZ, \"<\", Axis_TypeName_" + classname + ", " 
+        c_writer.write( "\tif( bArray)\n");
+        c_writer.write( "\t\taxiscSoapSerializerSerialize(pSZ, \"<\", Axis_TypeName_" + c_classname + ", \">\", NULL);\n");
+        c_writer.write( "\telse\n");
+        c_writer.write( "\t{\n");
+        c_writer.write( "\t\tconst AxiscChar * sPrefix = axiscSoapSerializerGetNamespacePrefix(pSZ, Axis_URI_" 
+                + c_classname + ", &blnIsNewPrefix);\n\n");
+        c_writer.write( "\t\t// If there are objects that require a local namespace, then define it here.\n");
+        c_writer.write( "\t\t// NB: This namespace will go out of scope when the closing tag is reached.\n");
+        c_writer.write( "\t\tif( !blnIsNewPrefix)\n");
+        c_writer.write( "\t\t\taxiscSoapSerializerSerialize(pSZ, \"<\", Axis_TypeName_" + c_classname + ", " 
                     + "\" xsi:type=\\\"\", sPrefix, \":\", "
-                    + "Axis_TypeName_" + classname + ", \"\\\">\", NULL);\n");
-        writer.write( "\t\telse\n");
-        writer.write( "\t\t\taxiscSoapSerializerSerialize(pSZ, \"<\", Axis_TypeName_" + classname + ", " 
+                    + "Axis_TypeName_" + c_classname + ", \"\\\">\", NULL);\n");
+        c_writer.write( "\t\telse\n");
+        c_writer.write( "\t\t\taxiscSoapSerializerSerialize(pSZ, \"<\", Axis_TypeName_" + c_classname + ", " 
                     + "\" xsi:type=\\\"\", sPrefix, \":\", " 
-                    + "Axis_TypeName_" + classname + ", \"\\\" xmlns:\", " 
-                    + "sPrefix, \"=\\\"\", Axis_URI_" + classname + ", \"\\\">\", NULL);\n");
-        writer.write("\t}\n");
+                    + "Axis_TypeName_" + c_classname + ", \"\\\" xmlns:\", " 
+                    + "sPrefix, \"=\\\"\", Axis_URI_" + c_classname + ", \"\\\">\", NULL);\n");
+        c_writer.write("\t}\n");
     }
 
     private void writeDeSerializeExtensionCode() throws IOException, WrapperFault
@@ -428,25 +428,25 @@
         if (extensionBaseAttrib != null
                 && extensionBaseAttrib.getTypeName() != null)
         {
-            CUtils.printBlockComment(writer, "Deserialize extension.");
+            CUtils.printBlockComment(c_writer, "Deserialize extension.");
             
             if (extensionBaseAttrib.isSimpleType())
             {
-                writer.write("\t{\n"); // ==== begin scope
-                writer.write("\t\tvoid* pCharDataAs;\n\n");
+                c_writer.write("\t{\n"); // ==== begin scope
+                c_writer.write("\t\tvoid* pCharDataAs;\n\n");
                 String typeName = extensionBaseAttrib.getTypeName();
                 String xsdType = CUtils.getXSDEnumeratorForType(typeName);
-                writer.write("\t\taxiscSoapDeSerializerGetChardataAs(pDZ, &pCharDataAs, " + xsdType + ");\n");
-                writer.write("\t\tparam->" + extensionBaseAttrib.getParamNameAsMember() + " = ");
+                c_writer.write("\t\taxiscSoapDeSerializerGetChardataAs(pDZ, &pCharDataAs, " + xsdType + ");\n");
+                c_writer.write("\t\tparam->" + extensionBaseAttrib.getParamNameAsMember() + " = ");
                 
                 if (CUtils.isPointerType(typeName))
-                    writer.write("(" + typeName + ") pCharDataAs;\n");
+                    c_writer.write("(" + typeName + ") pCharDataAs;\n");
                 else
                 {
-                    writer.write(" *(" + typeName + "*) pCharDataAs;\n");
-                    writer.write("\t\taxiscAxisDelete(pCharDataAs, " + xsdType + ");\n");
+                    c_writer.write(" *(" + typeName + "*) pCharDataAs;\n");
+                    c_writer.write("\t\taxiscAxisDelete(pCharDataAs, " + xsdType + ");\n");
                 }      
-                writer.write("\t}\n"); // ==== end scope
+                c_writer.write("\t}\n"); // ==== end scope
             }
             else
             {
@@ -455,7 +455,7 @@
         }
         else if (attribs.length == 0)
         {
-            System.out.println("Possible error in class " + classname
+            System.out.println("Possible error in class " + c_classname
                     + ": class with no attributes or elements............");
             
         }
@@ -463,10 +463,10 @@
     
     private void writeDeSerializeGlobalMethod() throws IOException, WrapperFault
     {
-        CUtils.printMethodComment(writer, "Function to deserialize an object of type "  
-                + classname + ".");  
+        CUtils.printMethodComment(c_writer, "Function to deserialize an object of type "  
+                + c_classname + ".");  
         
-        writer.write("int Axis_DeSerialize_" + classname + "(" + classname 
+        c_writer.write("int Axis_DeSerialize_" + c_classname + "(" + c_classname 
                 + "* param, AXISCHANDLE pDZ)\n{\n");
 
         //=============================================================================
@@ -477,13 +477,13 @@
         {
             writeDeSerializeExtensionCode();
 
-            writer.write("\treturn AXISC_SUCCESS;\n");
-            writer.write("}\n");
+            c_writer.write("\treturn AXISC_SUCCESS;\n");
+            c_writer.write("}\n");
             return;
         }  
         
         // Declare variables we use
-        writer.write("\tconst char* peekedElementName;\n");
+        c_writer.write("\tconst char* peekedElementName;\n");
 
         //=============================================================================
         // Deserialize attributes.
@@ -492,7 +492,7 @@
         //=============================================================================        
         
         if (attributeParamCount > 0)
-            CUtils.printBlockComment(writer, "Deserialize attributes.");
+            CUtils.printBlockComment(c_writer, "Deserialize attributes.");
         
         //=============================================================================
         // Deserialize attributes and elements.
@@ -516,7 +516,7 @@
         for (int i = 0; i < attribs.length; i++)
         {       
             if (i == attributeParamCount)
-                CUtils.printBlockComment(writer, "Deserialize elements.");
+                CUtils.printBlockComment(c_writer, "Deserialize elements.");
             
             // If All, then the element order is arbitrary, so we need a loop.  For both
             // 'choice' and 'all', we need to do a peek. 
@@ -533,12 +533,12 @@
 
                     // Flag for us to know when we found element for 'choice'.
                     if (handleChoice)
-                        CUtils.printComment(writer, "Deserialize \"choice\" group of elements."); 
+                        CUtils.printComment(c_writer, "Deserialize \"choice\" group of elements."); 
                     else
                     {
-                        CUtils.printComment(writer, "Deserialize \"all\" group of elements."); 
+                        CUtils.printComment(c_writer, "Deserialize \"all\" group of elements."); 
                         
-                        writer.write("\twhile (1)\n\t{\n");
+                        c_writer.write("\twhile (1)\n\t{\n");
                         
                         // Need to adjust tabs since we will be in a loop
                         tab1 = "\t\t";
@@ -546,36 +546,36 @@
                     }
                     
                     // for choice and all, we need to do a peek.
-                    writer.write(tab1 + "peekedElementName=axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
+                    c_writer.write(tab1 + "peekedElementName=axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
 
                     if (handleAll)
                     {
-                        writer.write(tab1 + "if (0x00 == *peekedElementName)\n");
-                        writer.write(tab1 + "\tbreak;\n");
+                        c_writer.write(tab1 + "if (0x00 == *peekedElementName)\n");
+                        c_writer.write(tab1 + "\tbreak;\n");
                     }
 
-                    writer.write("\n");
+                    c_writer.write("\n");
                    
-                    writer.write(tab1 + "if ");
+                    c_writer.write(tab1 + "if ");
                     firstIfWritten = true;
                 } 
                 else
                 {
-                    writer.write(tab1 + "else if ");
+                    c_writer.write(tab1 + "else if ");
                     if (handleAll)
                         tab2 = "\t\t";
                      else if (handleChoice)
                         tab2  = "\t";
                 }
 
-                writer.write("(strcmp(peekedElementName,\""
+                c_writer.write("(strcmp(peekedElementName,\""
                         + attribs[i].getElementNameAsSOAPString() + "\")==0)\n");
-                writer.write(tab1 + "{\n");
+                c_writer.write(tab1 + "{\n");
 
                 if (handleAll)
                 {
-                    writer.write(tab1 + "\tif (param->" + attribs[i].getParamNameAsMember() + ")\n");
-                    writer.write(tab1 + "\t\taxiscAxisGenerateRedundantElementException(peekedElementName);\n\n");
+                    c_writer.write(tab1 + "\tif (param->" + attribs[i].getParamNameAsMember() + ")\n");
+                    c_writer.write(tab1 + "\t\taxiscAxisGenerateRedundantElementException(peekedElementName);\n\n");
                 }
             }
             else
@@ -597,7 +597,7 @@
             if (attribs[i].isAnyType())
             {
                 anyCounter +=1;
-                writer.write(tab2 + "param->any" + anyCounter + " = axiscSoapDeSerializerGetAnyObject(pDZ);\n");
+                c_writer.write(tab2 + "param->any" + anyCounter + " = axiscSoapDeSerializerGetAnyObject(pDZ);\n");
             }
             else if (attribs[i].isArray())
             {
@@ -611,14 +611,14 @@
                     else
                         baseTypeName = attribs[i].getTypeName();
 
-                    writer.write(tab2 + "if (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n");
-                    writer.write(tab2 + "{\n");
-                    writer.write(tab2 + "\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember() + ", XSDC_ARRAY);\n");
-                    writer.write(tab2 + "\tparam->" + attribs[i].getParamNameAsMember() + "= NULL;\n");
-                    writer.write(tab2 + "}\n");
-                    writer.write("\n");
+                    c_writer.write(tab2 + "if (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n");
+                    c_writer.write(tab2 + "{\n");
+                    c_writer.write(tab2 + "\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember() + ", XSDC_ARRAY);\n");
+                    c_writer.write(tab2 + "\tparam->" + attribs[i].getParamNameAsMember() + "= NULL;\n");
+                    c_writer.write(tab2 + "}\n");
+                    c_writer.write("\n");
                  
-                    writer.write(tab2 + "param->" + attribs[i].getParamNameAsMember() 
+                    c_writer.write(tab2 + "param->" + attribs[i].getParamNameAsMember() 
                             + " = (" + baseTypeName + "_Array *)" 
                             + "axiscSoapDeSerializerGetBasicArray(pDZ, " 
                             + CUtils.getXSDEnumeratorForType(baseTypeName) + ", \"" 
@@ -627,7 +627,7 @@
                 else
                 {
                     arrayType = attribs[i].getTypeName();
-                    writer.write(tab1 + "axiscSoapDeSerializerGetCmplxArray(pDZ, (Axisc_Array *)param->" + attribs[i].getParamNameAsMember() 
+                    c_writer.write(tab1 + "axiscSoapDeSerializerGetCmplxArray(pDZ, (Axisc_Array *)param->" + attribs[i].getParamNameAsMember() 
                             + ", (void*)Axis_DeSerialize_"  + arrayType 
                             + ", (void*)Axis_Create_" + arrayType 
                             + ", (void*)Axis_Delete_" + arrayType 
@@ -641,9 +641,9 @@
                 // We only peek for elements, not element attributes!
                 if (attribs[i].isOptional() && !attribs[i].isAttribute() && !handleAll && !handleChoice)
                 {
-                    writer.write(tab1 + "peekedElementName = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
-                    writer.write(tab1 + "if (strcmp(peekedElementName, \"" + soapTagName + "\") == 0)\n");
-                    writer.write(tab1 + "{\n");
+                    c_writer.write(tab1 + "peekedElementName = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
+                    c_writer.write(tab1 + "if (strcmp(peekedElementName, \"" + soapTagName + "\") == 0)\n");
+                    c_writer.write(tab1 + "{\n");
                     
                     tab2 += "\t";
                 }
@@ -663,7 +663,7 @@
                         attribs[i].isOptional() ||
                         isPointerType)                
                 {
-                    writer.write(tab2 + "param->"
+                    c_writer.write(tab2 + "param->"
                             + attribs[i].getParamNameAsMember() + " = "
                             + "axiscSoapDeSerializer"
                             + CUtils.getDeserializerMethodName(
@@ -674,37 +674,37 @@
                 {
                     String elementNameToSearchFor = attribs[i].isAttribute()? attribs[i].getParamNameAsSOAPString():attribs[i].getElementNameAsSOAPString();
                     
-                    writer.write(tab2 + "{\n"); // start local scope
+                    c_writer.write(tab2 + "{\n"); // start local scope
                     
-                    writer.write(tab2 + "\t" + attribs[i].getTypeName() + " * "
+                    c_writer.write(tab2 + "\t" + attribs[i].getTypeName() + " * "
                         + attribs[i].getParamNameAsMember() + " = " 
                         + "axiscSoapDeSerializer"
                         + CUtils.getDeserializerMethodName(attribs[i].getTypeName(), attribs[i].isAttribute()) 
                         + "(pDZ, \"" + elementNameToSearchFor + "\",0);\n");
                     
-                    writer.write(tab2 + "\tif (" + attribs[i].getParamNameAsMember() + " != NULL)\n");
-                    writer.write(tab2 + "\t{\n");
-                    writer.write(tab2 + "\t\tparam->" + attribs[i].getParamNameAsMember() + " = *"
+                    c_writer.write(tab2 + "\tif (" + attribs[i].getParamNameAsMember() + " != NULL)\n");
+                    c_writer.write(tab2 + "\t{\n");
+                    c_writer.write(tab2 + "\t\tparam->" + attribs[i].getParamNameAsMember() + " = *"
                             + attribs[i].getParamNameAsMember() + ";\n");
 
                     if (CUtils.getXSDEnumeratorForType( attribs[i].getTypeName()).equals("XSDC_HEXBINARY")
                             || CUtils.getXSDEnumeratorForType( attribs[i].getTypeName()).equals("XSDC_BASE64BINARY"))
                     {
-                        writer.write(tab2 + "\t\t" + attribs[i].getParamNameAsMember() + "->__ptr = NULL;\n");
+                        c_writer.write(tab2 + "\t\t" + attribs[i].getParamNameAsMember() + "->__ptr = NULL;\n");
                     }
                     
-                    writer.write(tab2 + "\t\taxiscAxisDelete( (void *) " + attribs[i].getParamNameAsMember() 
+                    c_writer.write(tab2 + "\t\taxiscAxisDelete( (void *) " + attribs[i].getParamNameAsMember() 
                             + ", " + CUtils.getXSDEnumeratorForType( attribs[i].getTypeName()) + ");\n");
-                    writer.write(tab2 + "\t}\n");
+                    c_writer.write(tab2 + "\t}\n");
                     
-                    writer.write(tab2 + "}\n");  // end local scope                
+                    c_writer.write(tab2 + "}\n");  // end local scope                
                 }
                 
                 if (attribs[i].isOptional() && !attribs[i].isAttribute() && !handleAll && !handleChoice)
                 {
-                    writer.write("\t\t\t}\n");
-                    writer.write("\t\telse\n");
-                    writer.write("\t\t\tparam->" + attribs[i].getParamNameAsMember() + " = NULL;\n");
+                    c_writer.write("\t\t\t}\n");
+                    c_writer.write("\t\telse\n");
+                    c_writer.write("\t\t\tparam->" + attribs[i].getParamNameAsMember() + " = NULL;\n");
                 }
             }
             else
@@ -714,13 +714,13 @@
                 
                 if (attribs[i].isOptional() && !handleAll && !handleChoice)
                 {
-                    writer.write(tab1 + "peekedElementName = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
-                    writer.write(tab1 + "if (strcmp(peekedElementName, \"" + soapTagName + "\") == 0)\n");
+                    c_writer.write(tab1 + "peekedElementName = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
+                    c_writer.write(tab1 + "if (strcmp(peekedElementName, \"" + soapTagName + "\") == 0)\n");
                     
                     tab2 += "\t";
                 }
 
-                writer.write(tab2 + "param->" + attribs[i].getParamNameAsMember() 
+                c_writer.write(tab2 + "param->" + attribs[i].getParamNameAsMember() 
                         + " = ("  + attribs[i].getTypeName()
                         + "*)axiscSoapDeSerializerGetCmplxObject(pDZ,(void*)Axis_DeSerialize_" + attribs[i].getTypeName()
                         + ", (void*)Axis_Create_" + attribs[i].getTypeName() 
@@ -729,15 +729,15 @@
                 
                 if (attribs[i].isOptional()  && !handleAll && !handleChoice)
                 {
-                    writer.write(tab1 + "else\n");
-                    writer.write(tab1 + "\tparam->" + attribs[i].getParamNameAsMember() + " = NULL;\n");
+                    c_writer.write(tab1 + "else\n");
+                    c_writer.write(tab1 + "\tparam->" + attribs[i].getParamNameAsMember() + " = NULL;\n");
                 }      
             }
 
             if (attribs[i].getChoiceElement() || attribs[i].getAllElement())
-                writer.write(tab1 + "}\n");
+                c_writer.write(tab1 + "}\n");
             
-            writer.write("\n");
+            c_writer.write("\n");
         }
         
         if (firstIfWritten)
@@ -752,16 +752,16 @@
         //=============================================================================
         // Ensure there are no more elements - there should not be!
         //=============================================================================                           
-        writer.write("\n");
+        c_writer.write("\n");
         
-        CUtils.printBlockComment(writer, "Ensure no extraneous elements.");            
-        writer.write("\tpeekedElementName = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
-        writer.write("\tif (0x00 != *peekedElementName)\n");
-        writer.write("\t\taxiscAxisGenerateUnknownElementException(peekedElementName);\n");
-
-        writer.write("\n");
-        writer.write("\treturn axiscSoapDeSerializerGetStatus(pDZ);\n");
-        writer.write("}\n");
+        CUtils.printBlockComment(c_writer, "Ensure no extraneous elements.");            
+        c_writer.write("\tpeekedElementName = axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
+        c_writer.write("\tif (0x00 != *peekedElementName)\n");
+        c_writer.write("\t\taxiscAxisGenerateUnknownElementException(peekedElementName);\n");
+
+        c_writer.write("\n");
+        c_writer.write("\treturn axiscSoapDeSerializerGetStatus(pDZ);\n");
+        c_writer.write("}\n");
     }
 
     private void endChoiceOrAll(boolean handleAll, 
@@ -773,11 +773,11 @@
 
         if (handleAll)
         {
-              writer.write(tab1 + "else\n");
-              writer.write(tab1 + "\taxiscAxisGenerateUnknownElementException(peekedElementName);\n");
+              c_writer.write(tab1 + "else\n");
+              c_writer.write(tab1 + "\taxiscAxisGenerateUnknownElementException(peekedElementName);\n");
             
             // Closes for loop
-            writer.write("\t}\n");
+            c_writer.write("\t}\n");
             
             // Verify all fields set if possible.
             boolean commentPrinted = false;
@@ -788,16 +788,16 @@
                 {
                     if (!commentPrinted)
                     {
-                        CUtils.printComment(writer, "Ensure no missing elements in \"all\" groups."); 
+                        CUtils.printComment(c_writer, "Ensure no missing elements in \"all\" groups."); 
                         commentPrinted = true;
                     }
 
-                    writer.write("\tif (param->" + attribs[j].getParamNameAsMember() + " == NULL)");
-                    writer.write(" axiscAxisGenerateElementMissingException(\"" + attribs[j].getParamNameAsMember() + "\");\n");
+                    c_writer.write("\tif (param->" + attribs[j].getParamNameAsMember() + " == NULL)");
+                    c_writer.write(" axiscAxisGenerateElementMissingException(\"" + attribs[j].getParamNameAsMember() + "\");\n");
                 }
         }
         
-        writer.write("\n");
+        c_writer.write("\n");
     }
 
     /**
@@ -805,26 +805,26 @@
      */
     private void writeCreateGlobalMethod() throws IOException
     {       
-        CUtils.printMethodComment(writer, "Function used to create objects of type " 
-                + classname + ".");
+        CUtils.printMethodComment(c_writer, "Function used to create objects of type " 
+                + c_classname + ".");
         
-        writer.write("void* Axis_Create_" + classname + "(int nSize)\n{\n");
+        c_writer.write("void* Axis_Create_" + c_classname + "(int nSize)\n{\n");
 
-        writer.write("\tif (nSize > 0)\n");
-        writer.write("\t{\n");
-        writer.write("\t\tint i;\n");        
-        writer.write("\t\t" + classname + "** pNew = (" + 
-                classname + "**) axiscAxisNewCArray(nSize);\n");
-        writer.write("\t\tfor (i=0; i < nSize; ++i)\n");
-        writer.write("\t\t\tpNew[i] = (" + classname + "*)Axis_Create_" + classname + "(0);\n");
-        writer.write("\t\treturn (void *)pNew;\n");
-        writer.write("\t}\n");
-        writer.write("\telse\n"); 
-        writer.write("\t{\n");        
-        
-        writer.write("\t\t" + classname + "* pTemp = (" + classname + " *)malloc(sizeof(" + classname + "));\n");
-        writer.write("\t\tmemset(pTemp, 0, sizeof(" + classname + "));\n");
-        writer.write("\n");
+        c_writer.write("\tif (nSize > 0)\n");
+        c_writer.write("\t{\n");
+        c_writer.write("\t\tint i;\n");        
+        c_writer.write("\t\t" + c_classname + "** pNew = (" + 
+                c_classname + "**) axiscAxisNewCArray(nSize);\n");
+        c_writer.write("\t\tfor (i=0; i < nSize; ++i)\n");
+        c_writer.write("\t\t\tpNew[i] = (" + c_classname + "*)Axis_Create_" + c_classname + "(0);\n");
+        c_writer.write("\t\treturn (void *)pNew;\n");
+        c_writer.write("\t}\n");
+        c_writer.write("\telse\n"); 
+        c_writer.write("\t{\n");        
+        
+        c_writer.write("\t\t" + c_classname + "* pTemp = (" + c_classname + " *)malloc(sizeof(" + c_classname + "));\n");
+        c_writer.write("\t\tmemset(pTemp, 0, sizeof(" + c_classname + "));\n");
+        c_writer.write("\n");
         
         boolean writeNewline = false;
         
@@ -848,25 +848,25 @@
                     else
                         baseTypeName = attribs[i].getTypeName();
                     
-                    writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() 
+                    c_writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() 
                             + " = (" + baseTypeName + "_Array *)axiscAxisNew(XSDC_ARRAY, 0);\n");
                     
-                    writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() + "->m_Type = " 
+                    c_writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() + "->m_Type = " 
                             + CUtils.getXSDEnumeratorForType(baseTypeName) + ";\n");
                 }
                 else
                 {
-                        writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() + " = "
+                        c_writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() + " = "
                                 + "Axis_Create_" + attribs[i].getTypeName() + "_Array(0);\n");
                 }     
             }
         }
         
         if (writeNewline)
-            writer.write("\n");
-        writer.write("\t\treturn pTemp;\n");
-        writer.write("\t}\n");   
-        writer.write("}\n");
+            c_writer.write("\n");
+        c_writer.write("\t\treturn pTemp;\n");
+        c_writer.write("\t}\n");   
+        c_writer.write("}\n");
     }
 
     /**
@@ -874,32 +874,32 @@
      */
     private void writeDeleteGlobalMethod() throws IOException
     {
-        CUtils.printMethodComment(writer, "Function used to delete objects of type " 
-                + classname + ".");
+        CUtils.printMethodComment(c_writer, "Function used to delete objects of type " 
+                + c_classname + ".");
         
-        writer.write("void Axis_Delete_" + classname
-                + "(" + classname + "* param, int nSize)\n");
+        c_writer.write("void Axis_Delete_" + c_classname
+                + "(" + c_classname + "* param, int nSize)\n");
         
-        writer.write("{\n");
-        writer.write("\t/* If NULL, just return */\n");
-        writer.write("\tif (param == NULL)\n");
-        writer.write("\t\treturn;\n");
-        writer.write("\n");
-        
-        writer.write("\t/* Reclaim memory resources (recursion is used to reclaim arrays) */\n");
-        writer.write("\tif (nSize > 0)\n");
-        writer.write("\t{\n");
-        writer.write("\t\tint i;\n");
-        writer.write("\t\t" + classname + " **paramArray = (" + classname + " **)param;\n");
-        writer.write("\t\tfor (i = 0 ; i < nSize ; i++ )\n");
-        writer.write("\t\t\tif (paramArray[i])\n");
-        writer.write("\t\t\t\tAxis_Delete_" + classname + "(paramArray[i],0);\n");
-        writer.write("\t\taxiscAxisDeleteCArray((void **)param);\n");
-        writer.write("\t}\n");
+        c_writer.write("{\n");
+        c_writer.write("\t/* If NULL, just return */\n");
+        c_writer.write("\tif (param == NULL)\n");
+        c_writer.write("\t\treturn;\n");
+        c_writer.write("\n");
+        
+        c_writer.write("\t/* Reclaim memory resources (recursion is used to reclaim arrays) */\n");
+        c_writer.write("\tif (nSize > 0)\n");
+        c_writer.write("\t{\n");
+        c_writer.write("\t\tint i;\n");
+        c_writer.write("\t\t" + c_classname + " **paramArray = (" + c_classname + " **)param;\n");
+        c_writer.write("\t\tfor (i = 0 ; i < nSize ; i++ )\n");
+        c_writer.write("\t\t\tif (paramArray[i])\n");
+        c_writer.write("\t\t\t\tAxis_Delete_" + c_classname + "(paramArray[i],0);\n");
+        c_writer.write("\t\taxiscAxisDeleteCArray((void **)param);\n");
+        c_writer.write("\t}\n");
         
-        writer.write("\telse\n");
+        c_writer.write("\telse\n");
         
-        writer.write("\t{\n");
+        c_writer.write("\t{\n");
         int anyCounter = 0;
         
         for (int i = 0; i < attribs.length; i++)
@@ -923,10 +923,10 @@
                             || attribs[i].getChoiceElement() || attribs[i].getAllElement()) 
                         dot = "->";
                     
-                    writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + dot + "__ptr != NULL)\n");                    
-                    writer.write("\t\t\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember() 
+                    c_writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + dot + "__ptr != NULL)\n");                    
+                    c_writer.write("\t\t\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember() 
                             + dot + "__ptr, XSDC_UNSIGNEDBYTE);\n");
-                    writer.write("\n");
+                    c_writer.write("\n");
                 }
                 else if (CUtils.isPointerType(attribs[i].getTypeName()) || attribs[i].isArray()
                         || isElementNillable(i) || isElementOptional(i) 
@@ -937,10 +937,10 @@
                     else
                         passedInBaseType = CUtils.getXSDEnumeratorForType(baseTypeName);
                                     
-                    writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n");
-                    writer.write("\t\t\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember() 
+                    c_writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n");
+                    c_writer.write("\t\t\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember() 
                             + "," + passedInBaseType + ");\n");
-                    writer.write("\n");
+                    c_writer.write("\n");
                 }
             }
             else if (attribs[i].isAnyType())
@@ -948,8 +948,8 @@
                 anyCounter += 1;
                 String name = attribs[i].getParamNameAsMember() + anyCounter;
                 
-                writer.write("\t\tif (param->" + name + " != NULL)\n");
-                writer.write("\t\t\taxiscAxisDelete(param->" + name + ", XSDC_ANY);\n");               
+                c_writer.write("\t\tif (param->" + name + " != NULL)\n");
+                c_writer.write("\t\t\taxiscAxisDelete(param->" + name + ", XSDC_ANY);\n");               
             }            
             else
             {
@@ -957,17 +957,17 @@
                 if (attribs[i].isArray())
                     deleteFunctionSuffix = "_Array";
                 
-                writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + ")\n");
-                writer.write("\t\t\tAxis_Delete_" + attribs[i].getTypeName() + deleteFunctionSuffix 
+                c_writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + ")\n");
+                c_writer.write("\t\t\tAxis_Delete_" + attribs[i].getTypeName() + deleteFunctionSuffix 
                             + "(param->" + attribs[i].getParamNameAsMember() + ", 0);\n");  
                     
             }
         }
         
-        writer.write("\t\tfree(param);\n");
-        writer.write("\t}\n");
+        c_writer.write("\t\tfree(param);\n");
+        c_writer.write("\t}\n");
         
-        writer.write("}\n");
+        c_writer.write("}\n");
     }
     
     /**
@@ -977,13 +977,13 @@
     {
         try
         {
-            CUtils.printMethodComment(writer, "Function used to check whether object has allowed values. Not implemented yet.");
+            CUtils.printMethodComment(c_writer, "Function used to check whether object has allowed values. Not implemented yet.");
             
-            writer.write("int Check_Restrictions_" + classname + "(" + classname + " value)\n");
-            writer.write("{\n");
-            writer.write("\treturn 0;\n");
+            c_writer.write("int Check_Restrictions_" + c_classname + "(" + c_classname + " value)\n");
+            c_writer.write("{\n");
+            c_writer.write("\treturn 0;\n");
             //TODO write code to check the restrictions
-            writer.write("}\n");
+            c_writer.write("}\n");
         }
         catch (IOException e)
         {

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java Fri Aug 22 10:37:39 2008
@@ -53,14 +53,14 @@
     {
         try
         {
-            this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
+            c_writer = new BufferedWriter(new FileWriter(getFilePath(), false));
             writeClassComment();
             writePreprocessorStatements();
             writeGlobalCodes();
             writeAttributes();
             writeMethods();
-            writer.flush();
-            writer.close();
+            c_writer.flush();
+            c_writer.close();
             if (WSDL2Ws.c_verbose)
                 System.out.println(getFilePath().getAbsolutePath() + " created.....");
         }
@@ -84,16 +84,16 @@
     {
         String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
         new File(targetOutputLocation).mkdirs();
-        String fileName = targetOutputLocation + "/" + classname + CUtils.getImplFileExtension();
+        String fileName = targetOutputLocation + "/" + c_classname + CUtils.getImplFileExtension();
 
         if (useServiceName)
         {
             String serviceName = this.wscontext.getServiceInfo().getServicename();
-            fileName = targetOutputLocation + "/" + serviceName + "_" + classname + CUtils.getImplFileExtension();
-            this.wscontext.addGeneratedFile(serviceName + "_" + classname + CUtils.getImplFileExtension());
+            fileName = targetOutputLocation + "/" + serviceName + "_" + c_classname + CUtils.getImplFileExtension();
+            this.wscontext.addGeneratedFile(serviceName + "_" + c_classname + CUtils.getImplFileExtension());
         }
         else
-            this.wscontext.addGeneratedFile(classname + CUtils.getImplFileExtension());
+            this.wscontext.addGeneratedFile(c_classname + CUtils.getImplFileExtension());
 
         return new File(fileName);
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java?rev=688130&r1=688129&r2=688130&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java Fri Aug 22 10:37:39 2008
@@ -57,11 +57,11 @@
     {
         try
         {
-            writer.write("/*\n");
-            writer.write(" * This file was auto-generated by the Axis C++ Web Service "
+            c_writer.write("/*\n");
+            c_writer.write(" * This file was auto-generated by the Axis C++ Web Service "
                     + "Generator (WSDL2Ws)\n");
-            writer.write(" * This file contains Client Stub for remote web service \n");
-            writer.write(" */\n\n");
+            c_writer.write(" * This file contains Client Stub for remote web service \n");
+            c_writer.write(" */\n\n");
         }
         catch (IOException e)
         {
@@ -85,21 +85,21 @@
         MethodInfo minfo;
         try
         {
-            writer.write("\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("/* --- Functions relating to web service client proxy                --- */\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("\n");
-
-            writer.write("extern AXISCHANDLE get_" + classname + "_stub(const char* pchEndPointUri);\n");
-            writer.write("extern void destroy_" + classname + "_stub(AXISCHANDLE pStub);\n");
-            writer.write("extern int get_" + classname + "_Status(AXISCHANDLE pStub);\n");
-
-            writer.write("\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("/* --- Functions relating to web service methods                     --- */\n");
-            writer.write("/* ********************************************************************* */\n");
-            writer.write("\n");
+            c_writer.write("\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("/* --- Functions relating to web service client proxy                --- */\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("\n");
+
+            c_writer.write("extern AXISCHANDLE get_" + c_classname + "_stub(const char* pchEndPointUri);\n");
+            c_writer.write("extern void destroy_" + c_classname + "_stub(AXISCHANDLE pStub);\n");
+            c_writer.write("extern int get_" + c_classname + "_Status(AXISCHANDLE pStub);\n");
+
+            c_writer.write("\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("/* --- Functions relating to web service methods                     --- */\n");
+            c_writer.write("/* ********************************************************************* */\n");
+            c_writer.write("\n");
 
             for (int i = 0; i < methods.size(); i++)
             {
@@ -109,7 +109,7 @@
                 
                 //write return type
                 if (0 == noOfOutParams)
-                    writer.write("extern void ");
+                    c_writer.write("extern void ");
                 else if (1 == noOfOutParams)
                 {
                     ParameterInfo returnParam =
@@ -119,24 +119,24 @@
                             || (CUtils.isSimpleType(outParamTypeName)
                             && (returnParam.isNillable() || returnParam.isOptional())
                             && !(CUtils.isPointerType(outParamTypeName))))
-                        writer.write("extern " + outParamTypeName + " * ");
+                        c_writer.write("extern " + outParamTypeName + " * ");
                     else
-                        writer.write("extern " + outParamTypeName + " ");
+                        c_writer.write("extern " + outParamTypeName + " ");
                 }
                 else
                 {
                     isAllTreatedAsOutParams = true;
-                    writer.write("extern void ");
+                    c_writer.write("extern void ");
                 }
                 
                 //write return type
-                writer.write(minfo.getMethodname() + "(AXISCHANDLE pStub");                
+                c_writer.write(minfo.getMethodname() + "(AXISCHANDLE pStub");                
 
                 //write parameter names 
                 Iterator params = minfo.getInputParameterTypes().iterator();
                 if (params.hasNext())
                 {
-                    writer.write(", ");   
+                    c_writer.write(", ");   
                     
                     ParameterInfo fparam = (ParameterInfo) params.next();
                     String paramTypeName = CUtils
@@ -148,14 +148,14 @@
                             && fparam.isNillable()
                             && !(CUtils.isPointerType(paramTypeName))))
                     {
-                        writer.write(
+                        c_writer.write(
                                 paramTypeName
                                     + " * Value"
                                     + 0);
                      }
                     else
                     {
-                        writer.write(
+                        c_writer.write(
                             paramTypeName
                                 + " Value"
                                 + 0);
@@ -164,7 +164,7 @@
                 
                 for (int j = 1; params.hasNext(); j++)
                 {
-                    writer.write(", ");
+                    c_writer.write(", ");
                     
                     ParameterInfo nparam = (ParameterInfo) params.next();
                     String paramTypeName = CUtils
@@ -175,14 +175,14 @@
                             && nparam.isNillable()
                             && !(CUtils.isPointerType(paramTypeName)))
                     {
-                        writer.write(", "
+                        c_writer.write(", "
                                 + paramTypeName
                                 + " * Value"
                                 + j);
                     }
                     else
                     {
-                        writer.write(", "
+                        c_writer.write(", "
                                 + paramTypeName
                                 + " Value"
                                 + j);
@@ -195,7 +195,7 @@
                     for (int j = 0; params.hasNext(); j++)
                     {
                         ParameterInfo nparam = (ParameterInfo) params.next();
-                        writer.write(
+                        c_writer.write(
                             ", AXISC_OUT_PARAM "
                                 + CUtils
                                     .getClassNameFromParamInfoConsideringArrays(
@@ -205,7 +205,7 @@
                                 + j);
                     }
                 }
-                writer.write(");\n");
+                c_writer.write(");\n");
             }
         }
         catch (Exception e)
@@ -221,8 +221,8 @@
     {
         try
         {
-            writer.write("#include <axis/client/Stub.h>\n");
-            writer.write("#include <axis/AxisWrapperAPI.h>\n");
+            c_writer.write("#include <axis/client/Stub.h>\n");
+            c_writer.write("#include <axis/AxisWrapperAPI.h>\n");
             Type atype;
             Iterator types = this.wscontext.getTypemap().getTypes().iterator();
             HashSet typeSet = new HashSet();
@@ -241,9 +241,9 @@
             Iterator itr = typeSet.iterator();
             while (itr.hasNext())
             {
-                writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension()+"\"\n");
+                c_writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension()+"\"\n");
             }
-            writer.write("\n");
+            c_writer.write("\n");
         }
         catch (IOException e)
         {



Mime
View raw message