ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
Date Tue, 03 Aug 2004 05:20:39 GMT
damitha     2004/08/02 22:20:39

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp Tag:
                        NamespaceTesting_branch ExceptionHeaderWriter.java
                        ParmHeaderFileWriter.java WrapHeaderWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Tag:
                        NamespaceTesting_branch Type.java
  Log:
  Namespace fixes and latest axis jars fixes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.10.1  +2 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java
  
  Index: ExceptionHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.3.10.1
  diff -u -r1.3 -r1.3.10.1
  --- ExceptionHeaderWriter.java	22 Jul 2004 12:44:39 -0000	1.3
  +++ ExceptionHeaderWriter.java	3 Aug 2004 05:20:38 -0000	1.3.10.1
  @@ -63,7 +63,8 @@
   				    writer.write("#include <axis/server/AxisException.h>\n");
   				    writer.write("#include <axis/ISoapFault.h>\n");
   				    getLangName();				
  -				    writer.write("using namespace std;\n");				
  +				    writer.write("using namespace std;\n");			
  +				    writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
   			}catch(IOException e){
   				throw new WrapperFault(e);
   			}
  
  
  
  1.15.14.1 +2 -1      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.15
  retrieving revision 1.15.14.1
  diff -u -r1.15 -r1.15.14.1
  --- ParmHeaderFileWriter.java	7 Jun 2004 10:50:18 -0000	1.15
  +++ ParmHeaderFileWriter.java	3 Aug 2004 05:20:38 -0000	1.15.14.1
  @@ -106,7 +106,8 @@
   	  try{
   		Type atype;
   		Iterator types = this.wscontext.getTypemap().getTypes().iterator();
  -		writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
  +		writer.write("#include <axis/server/AxisUserAPI.h>\n");
  +		writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
   		HashSet typeSet = new HashSet();
   		for (int i=0;i<attribs.length; i++)
   		{
  
  
  
  1.16.10.1 +2 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
  
  Index: WrapHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java,v
  retrieving revision 1.16
  retrieving revision 1.16.10.1
  diff -u -r1.16 -r1.16.10.1
  --- WrapHeaderWriter.java	22 Jul 2004 12:44:39 -0000	1.16
  +++ WrapHeaderWriter.java	3 Aug 2004 05:20:38 -0000	1.16.10.1
  @@ -118,7 +118,8 @@
   			writer.write("#include <axis/server/IMessageData.h>\n");
   			writer.write("#include <axis/server/GDefine.h>\n");
   			writer.write("#include <axis/server/AxisWrapperAPI.h>\n");
  -			writer.write("#include \"AxisServiceException.h\" \n\n");
  +			writer.write("#include \"AxisServiceException.h\" \n");
  +			writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
   			//writeFaultHeaders();
   			
   		}catch(IOException e){
  
  
  
  No                   revision
  No                   revision
  1.13.16.1 +6 -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.13
  retrieving revision 1.13.16.1
  diff -u -r1.13 -r1.13.16.1
  --- Type.java	9 Apr 2004 08:49:34 -0000	1.13
  +++ Type.java	3 Aug 2004 05:20:39 -0000	1.13.16.1
  @@ -175,6 +175,12 @@
    */
   	public void setTypeNameForElementName(ElementInfo element) {
   		String attribName = TypeMap.resoleveWSDL2LanguageNameClashes(element.getName().getLocalPart(),this.language);
  +		if (attribName.lastIndexOf('>') > 1 )
  +		{
  +			 attribName=attribName.substring(attribName.lastIndexOf('>')+1,attribName.length());
  +		         System.out.println(attribName+"   attribute Name ");
  +		}
  +		
   		if (hasOrder)
   			this.attribOrder.add(attribName);
   		this.elements.put(attribName, element);
  
  
  

Mime
View raw message