ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
Date Thu, 19 Aug 2004 12:54:54 GMT
samisa      2004/08/19 05:54:54

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws WSDL2Ws.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
                        ClientStubHeaderWriter.java
                        ParmHeaderFileWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
  Log:
  Solved header file missing problem
  
  Revision  Changes    Path
  1.35      +1 -0      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
  
  Index: WSDL2Ws.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- WSDL2Ws.java	12 Aug 2004 10:25:30 -0000	1.34
  +++ WSDL2Ws.java	19 Aug 2004 12:54:54 -0000	1.35
  @@ -553,6 +553,7 @@
   			if (CUtils.isBasicType(qn)) return null;
   			QName newqn = new QName(type.getQName().getNamespaceURI(), qn.getLocalPart()+"_Array");
   			typedata = new Type(newqn, newqn.getLocalPart(), true, targetLanguage);
  +                        typedata.setElementType(type.getRefType().getRefType().getQName().getLocalPart());
   			typeMap.addType(newqn, typedata);
   		}else {
   			typedata = new Type(type.getQName(), type.getQName().getLocalPart(), true, targetLanguage);
  
  
  
  1.19      +14 -0     ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
  
  Index: ClientStubHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ClientStubHeaderWriter.java	16 Aug 2004 09:22:52 -0000	1.18
  +++ ClientStubHeaderWriter.java	19 Aug 2004 12:54:54 -0000	1.19
  @@ -187,11 +187,25 @@
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
   			HashSet typeSet = new HashSet();
  +                        HashSet removeSet = new HashSet();
   			while(types.hasNext()){
   				atype = (Type)types.next();
  +                        if( atype.isArray() ) {
  +				if( atype.getElementType().equals("string") )
  +					removeSet.add( atype.getLanguageSpecificName() );
  +			}
  +                        if( atype.getBaseType() != null ){
  +				if( atype.getBaseType().getLocalPart().equals( "string" ) ){
  +					removeSet.add( atype.getLanguageSpecificName() + "_Array" );
  +                                 }
  +}
   				if (atype.getLanguageSpecificName().startsWith(">")) continue;				
   				typeSet.add(atype.getLanguageSpecificName());
   			}
  +                        Iterator ritr = removeSet.iterator();
  +                        while( ritr.hasNext() )
  +                             typeSet.remove( ritr.next() );
  +
   			Iterator itr = typeSet.iterator();
   			while(itr.hasNext())
   			{
  
  
  
  1.16      +1 -0      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
  
  Index: ParmHeaderFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ParmHeaderFileWriter.java	16 Aug 2004 09:22:52 -0000	1.15
  +++ ParmHeaderFileWriter.java	19 Aug 2004 12:54:54 -0000	1.16
  @@ -81,6 +81,7 @@
   			writer.write("typedef ");
   			if ("string".equals(baseType.getLocalPart()) || "NMTOKEN".equals(baseType.getLocalPart())){
   				writer.write(langTypeName + " " + classname + ";\n");
  +				writer.write("typedef " + langTypeName + "_Array " + classname + "_Array;\n");
   				for(int i=1; i<restrictionData.size();i++){
   					QName value = (QName)restrictionData.elementAt(i);
   					if ("enumeration".equals(value.getLocalPart())){
  
  
  
  1.20      +13 -1     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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Type.java	19 Aug 2004 09:37:10 -0000	1.19
  +++ Type.java	19 Aug 2004 12:54:54 -0000	1.20
  @@ -80,6 +80,9 @@
       private boolean isreferenced = false;
       
       private String language;
  +    //Samisa: element type
  +    private String elementType;
  +    
   
       public Type(QName name, String languageSpecificName, boolean hasOrder,String language)
{
           this.languageSpecificName = languageSpecificName;
  @@ -340,8 +343,9 @@
   	       	str =str +"isArray ="+isArray+"\n";
   	       	str = str + "Elements[\n";
   	       	Iterator c = elements.values().iterator();
  +	       	java.util.Enumeration k = elements.keys();//.iterator();
   			while(c.hasNext())	
  -			str = str +","+ c.next()+"\n";
  +			str = str +"," + k.toString() + ":"+ c.next()+"\n";
            	       	str = str + "]\n";
   	       	
   			c = attributes.keySet().iterator();
  @@ -403,6 +407,14 @@
   	 */
   	public void setBaseType(QName baseType) {
   		this.baseType = baseType;
  +	}
  +
  +	public void setElementType(String type) {
  +		elementType = type;
  +	}
  +	
  +	public String getElementType() {
  +		return elementType;
   	}
   
   }
  
  
  

Mime
View raw message