axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From susan...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
Date Mon, 13 Oct 2003 11:09:14 GMT
susantha    2003/10/13 04:09:14

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws WrapperUtils.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
                        ClientStubWriter.java ParmHeaderFileWriter.java
                        ServiceHeaderWriter.java ServiceWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
  Log:
  Fixed few bugs in generating C wrappers/skeletons and Stubs. Removed few files which are
no longer needed.
  
  Revision  Changes    Path
  1.3       +0 -3      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java
  
  Index: WrapperUtils.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WrapperUtils.java	13 Oct 2003 05:03:14 -0000	1.2
  +++ WrapperUtils.java	13 Oct 2003 11:09:13 -0000	1.3
  @@ -59,14 +59,11 @@
    */
   package org.apache.axis.wsdl.wsdl2ws;
   
  -import java.util.Enumeration;
   import java.util.Stack;
   import java.util.StringTokenizer;
   
   import javax.xml.namespace.QName;
   
  -import org.apache.axis.wsdl.wsdl2ws.Constants;
  -import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
   import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
   import org.apache.axis.wsdl.wsdl2ws.info.Type;
   import org.apache.axis.wsdl.wsdl2ws.info.TypeMap;
  
  
  
  1.8       +0 -2      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ClientStubWriter.java	13 Oct 2003 05:03:14 -0000	1.7
  +++ ClientStubWriter.java	13 Oct 2003 11:09:13 -0000	1.8
  @@ -154,10 +154,8 @@
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
   			writer.write("#include \""+classname+".h\"\n\n");
  -			writer.write("#include <GDefine.h>\n");
   			writer.write("#include <IWrapperSoapDeSerializer.h>\n");
   			writer.write("#include <IWrapperSoapSerializer.h>\n");
  -			writer.write("#include <IParam.h>\n\n");
   		}catch(IOException e){
   			throw new WrapperFault(e);
   		}
  
  
  
  1.7       +1 -2      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
  
  Index: ParmHeaderFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ParmHeaderFileWriter.java	13 Oct 2003 05:03:14 -0000	1.6
  +++ ParmHeaderFileWriter.java	13 Oct 2003 11:09:13 -0000	1.7
  @@ -147,8 +147,7 @@
   		{
   			writer.write("#include \""+itr.next().toString()+".h\"\n");
   		}		
  -		
  -				
  +			
   		//Local name and the URI for the type
   		writer.write("//Local name and the URI for the type\n");
   		writer.write("static const char* Axis_URI_"+classname+" = \""+type.getName().getNamespaceURI()+"\";\n");
  
  
  
  1.5       +9 -5      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
  
  Index: ServiceHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServiceHeaderWriter.java	13 Oct 2003 05:03:14 -0000	1.4
  +++ ServiceHeaderWriter.java	13 Oct 2003 11:09:13 -0000	1.5
  @@ -63,6 +63,7 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.ArrayList;
  +import java.util.HashSet;
   import java.util.Iterator;
   
   import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
  @@ -150,7 +151,6 @@
   				  writer.write("\t\tvoid ");
   			  else {
   			  	  String outparam = minfo.getReturnType().getLangName();
  -				  isSimpleType = CPPUtils.isSimpleType(outparam);
   				  writer.write("\t\t"+WrapperUtils.getClassNameFromParamInfoConsideringArrays(minfo.getReturnType(),wscontext));
   			  }
   			  writer.write(" "+minfo.getMethodname()+"(");
  @@ -159,12 +159,10 @@
   			  Iterator params = minfo.getParameterTypes().iterator();
   			  if(params.hasNext()){
   			  	  ParameterInfo fparam = (ParameterInfo)params.next();
  -				  isSimpleType = CPPUtils.isSimpleType(fparam.getLangName());
   				  writer.write(WrapperUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext)+"
Value"+0);
   			  }
   			  for(int j =1; params.hasNext();j++){
   				  ParameterInfo nparam = (ParameterInfo)params.next();
  -				  isSimpleType = CPPUtils.isSimpleType(nparam.getLangName());
   				  writer.write(","+WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext)+"
Value"+j);
   			  }
   			  writer.write(");\n");
  @@ -181,10 +179,16 @@
   		try{
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
  +			HashSet typeSet = new HashSet();
   			while(types.hasNext()){
   				atype = (Type)types.next();
  -				writer.write("#include \""+atype.getLanguageSpecificName()+".h\"\n");
  -			}
  +				typeSet.add(atype.getLanguageSpecificName());
  +			}		
  +			Iterator itr = typeSet.iterator();
  +			while(itr.hasNext())
  +			{
  +				writer.write("#include \""+itr.next().toString()+".h\"\n");
  +			}		
   			writer.write("\n");
   		}catch (IOException e) {
   			e.printStackTrace();
  
  
  
  1.4       +0 -3      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
  
  Index: ServiceWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServiceWriter.java	13 Oct 2003 05:03:14 -0000	1.3
  +++ ServiceWriter.java	13 Oct 2003 11:09:13 -0000	1.4
  @@ -138,7 +138,6 @@
   				  writer.write("void ");
   			  else {
   				String outparam = minfo.getReturnType().getLangName();
  -				isSimpleType = CPPUtils.isSimpleType(outparam);
   				writer.write(WrapperUtils.getClassNameFromParamInfoConsideringArrays(minfo.getReturnType(),wscontext));
   			  }
   			  writer.write(" "+classname+"::"+minfo.getMethodname()+"(");
  @@ -147,12 +146,10 @@
   			Iterator params = minfo.getParameterTypes().iterator();
   			if(params.hasNext()){
   				ParameterInfo fparam = (ParameterInfo)params.next();
  -				isSimpleType = CPPUtils.isSimpleType(fparam.getLangName());
   				writer.write(WrapperUtils.getClassNameFromParamInfoConsideringArrays(fparam,wscontext)+"
Value"+0);
   			}
   			for(int j =1; params.hasNext();j++){
   				ParameterInfo nparam = (ParameterInfo)params.next();
  -				isSimpleType = CPPUtils.isSimpleType(nparam.getLangName());
   				writer.write(", "+WrapperUtils.getClassNameFromParamInfoConsideringArrays(nparam,wscontext)+"
Value"+j);
   			}
   			writer.write(")\n{\n}\n");
  
  
  
  1.3       +3 -0      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java
  
  Index: Type.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Type.java	10 Oct 2003 05:13:14 -0000	1.2
  +++ Type.java	13 Oct 2003 11:09:13 -0000	1.3
  @@ -71,6 +71,7 @@
   
   import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
   import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
  +import org.apache.axis.wsdl.wsdl2ws.c.CUtils;
   import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
   
   public class Type {
  @@ -105,6 +106,8 @@
           if(languageSpecificName == null){
           	if(WrapperConstants.LANGUAGE_CPP.equalsIgnoreCase(this.language))
   				this.languageSpecificName = CPPUtils.getclass4qname(name);
  +			else if(WrapperConstants.LANGUAGE_C.equalsIgnoreCase(this.language))
  +					this.languageSpecificName = CUtils.getclass4qname(name);
   			else
   				this.languageSpecificName = TypeMap.getBasicTypeClass4qname(name);
   			 
  
  
  

Mime
View raw message