You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2004/09/08 08:41:16 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal AllParamWriter.java ArrayParamWriter.java BeanParamWriter.java CPPClassWriter.java ClassLoader.java HeaderFileWriter.java ParamCPPFileWriter.java ParmHeaderFileWriter.java
samisa 2004/09/07 23:41:16
Modified: c/src/wsdl .classpath
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CLArgParser.java
WSDL2Ws.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c
AllParamWriter.java ArrayParamWriter.java
BeanParamWriter.java CFileWriter.java
ClassLoader.java HeaderFileWriter.java
ParamCFileWriter.java ParmHeaderFileWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal
AllParamWriter.java ArrayParamWriter.java
BeanParamWriter.java CFileWriter.java
ClassLoader.java HeaderFileWriter.java
ParamCFileWriter.java ParmHeaderFileWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
AllParamWriter.java ArrayParamWriter.java
BeanParamWriter.java CPPClassWriter.java
CPPExceptionClassWriter.java ClassLoader.java
ClientStubWriter.java ExceptionHeaderWriter.java
HeaderFileWriter.java ParamCPPFileWriter.java
ParmHeaderFileWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
AllParamWriter.java ArrayParamWriter.java
BeanParamWriter.java CPPClassWriter.java
ClassLoader.java HeaderFileWriter.java
ParamCPPFileWriter.java ParmHeaderFileWriter.java
Log:
Added the verbose mode support with -v command line option and verbose
public static member in WSDL2Ws class.
The default is not to be verbose
Revision Changes Path
1.7 +8 -8 ws-axis/c/src/wsdl/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/.classpath,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .classpath 30 Jul 2004 02:35:16 -0000 1.6
+++ .classpath 8 Sep 2004 06:41:10 -0000 1.7
@@ -2,13 +2,13 @@
<classpath>
<classpathentry kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/axis.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/commons-discovery.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/jaxrpc.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/saaj.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/wsdl4j.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/log4j-1.2.8.jar"/>
- <classpathentry kind="lib" path="E:/Axis/axis-1_2beta/lib/axis-ant.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/axis-ant.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/axis.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/commons-discovery.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/jaxrpc.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/saaj.jar"/>
+ <classpathentry kind="lib" path="/home/samisa/java/axis-1_2beta/lib/wsdl4j.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.4 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CLArgParser.java
Index: CLArgParser.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CLArgParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CLArgParser.java 8 Sep 2004 04:27:03 -0000 1.3
+++ CLArgParser.java 8 Sep 2004 06:41:10 -0000 1.4
@@ -36,7 +36,7 @@
if (!args[i].startsWith("-"))
this.args.add(args[i]);
else {
- System.out.println("args " + args[i].substring(1,2) + " = " + args[i].substring(2));
+ //System.out.println("args " + args[i].substring(1,2) + " = " + args[i].substring(2));
bag.put(args[i].substring(1, 2), args[i].substring(2));
}
1.39 +20 -12 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- WSDL2Ws.java 8 Sep 2004 04:27:03 -0000 1.38
+++ WSDL2Ws.java 8 Sep 2004 06:41:10 -0000 1.39
@@ -578,7 +578,8 @@
QName typeName = new QName(type.getQName().getNamespaceURI(),localpart);
ElementInfo eleinfo = new ElementInfo(typeName,createTypeInfo(base.getQName(),targetLanguage));
typedata.setExtensionBaseType(eleinfo);
- System.out.print("=====complexType with simpleContent is found : "+ type.getQName().getLocalPart()+"=====\n");
+ if ( WSDL2Ws.verbose)
+ System.out.print("=====complexType with simpleContent is found : "+ type.getQName().getLocalPart()+"=====\n");
}
else{
//types declared as simpleType
@@ -773,7 +774,7 @@
public static void main(String[] args) throws Exception {
CLArgParser data = new CLArgParser(args);
- System.out.println(data.getArgumentCount());
+
if (data.getArgumentCount() != 1) {
usage();
}
@@ -789,16 +790,23 @@
WSDL2Ws.makeSystem = data.getOptionBykey("m");
- System.out.println( WSDL2Ws.makeSystem );
- WSDL2Ws gen = new WSDL2Ws(data);
- gen.genarateWrappers(
- null,
- data.getOptionBykey("o"),
- data.getOptionBykey("l"),
- data.getOptionBykey("i"),
- data.getOptionBykey("s"),
- data.getOptionBykey("c"),
- data.getOptionBykey("w"));
+ try {
+
+ WSDL2Ws gen = new WSDL2Ws(data);
+ gen.genarateWrappers(
+ null,
+ data.getOptionBykey("o"),
+ data.getOptionBykey("l"),
+ data.getOptionBykey("i"),
+ data.getOptionBykey("s"),
+ data.getOptionBykey("c"),
+ data.getOptionBykey("w"));
+
+ System.out.println( "\nCode generation completed.\n");
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.out.println( "\nCode generation failed. Please see errors above.\n");
+ }
}
}
}
1.8 +6 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AllParamWriter.java 9 Apr 2004 08:49:32 -0000 1.7
+++ AllParamWriter.java 8 Sep 2004 06:41:10 -0000 1.8
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c;
import java.util.Iterator;
@@ -27,6 +28,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
/**
* Parameter genarator.. genarate all necessary param classes
@@ -52,7 +54,8 @@
type = (Type)enu.next();
if(wscontext.getWrapInfo().getImplStyle().equals(WrapperConstants.IMPL_STYLE_STRUCT)){
if(type.isArray()){
- System.out.println("Array writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("Array writer called ......");
ArrayParamWriter writer = (new ArrayParamWriter(wscontext,type));
if (!writer.isSimpleTypeArray()) writer.writeSource();
}
@@ -65,7 +68,8 @@
System.out.println("ignoring anonymous type "+ type.getLanguageSpecificName()+"\n");
}
else{
- System.out.println("struct writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("struct writer called ......");
(new BeanParamWriter(wscontext,type)).writeSource();
(new ParmHeaderFileWriter(wscontext,type)).writeSource();
}
1.10 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ArrayParamWriter.java 16 Aug 2004 09:22:48 -0000 1.9
+++ ArrayParamWriter.java 8 Sep 2004 06:41:10 -0000 1.10
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
@@ -36,6 +37,7 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ArrayParamWriter extends ParamWriter{
public ArrayParamWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -68,7 +70,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.20 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BeanParamWriter.java 16 Aug 2004 09:22:48 -0000 1.19
+++ BeanParamWriter.java 8 Sep 2004 06:41:10 -0000 1.20
@@ -87,7 +87,7 @@
writer.write("int Axis_Serialize_"+classname+"("+classname+"* param, IWrapperSoapSerializer* pSZ, bool bArray)\n{\n");
if (attribs.length == 0) {
//nothing to print if this is simple type we have inbuild types
- System.out.println("possible error calss with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\t}\n\n");
return;
}
@@ -148,7 +148,7 @@
writer.write("int Axis_DeSerialize_"+classname+"("+classname+"* param, IWrapperSoapDeSerializer* pDZ)\n{\n");
if (attribs.length == 0) {
- System.out.println("possible error calss with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\t}\n\n");
return;
}
1.5 +4 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java
Index: CFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/CFileWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CFileWriter.java 9 Apr 2004 08:49:32 -0000 1.4
+++ CFileWriter.java 8 Sep 2004 06:41:10 -0000 1.5
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c;
@@ -25,8 +26,8 @@
import java.io.FileWriter;
import java.io.IOException;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
-
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class CFileWriter extends BasicFileWriter{
public CFileWriter(String classname)throws WrapperFault{
@@ -45,7 +46,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.11 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClassLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClassLoader.java 14 Jun 2004 09:17:45 -0000 1.10
+++ ClassLoader.java 8 Sep 2004 06:41:10 -0000 1.11
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c;
@@ -33,6 +34,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ClassLoader implements SourceWriter{
private Writer writer;
@@ -79,7 +81,8 @@
writer.write("}\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
}catch(IOException e){
throw new WrapperFault(e);
}
1.6 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java
Index: HeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HeaderFileWriter.java 9 Apr 2004 08:49:32 -0000 1.5
+++ HeaderFileWriter.java 8 Sep 2004 06:41:10 -0000 1.6
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c;
@@ -29,6 +30,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class HeaderFileWriter extends BasicFileWriter {
public HeaderFileWriter(String classname)throws WrapperFault{
@@ -51,7 +53,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.9 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java
Index: ParamCFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParamCFileWriter.java 12 Jun 2004 03:57:11 -0000 1.8
+++ ParamCFileWriter.java 8 Sep 2004 06:41:12 -0000 1.9
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c;
@@ -31,6 +32,7 @@
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class ParamCFileWriter extends ParamWriter{
public ParamCFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -48,7 +50,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.14 +5 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ParmHeaderFileWriter.java 16 Aug 2004 09:22:48 -0000 1.13
+++ ParmHeaderFileWriter.java 8 Sep 2004 06:41:12 -0000 1.14
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c;
@@ -34,6 +35,8 @@
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
+
public class ParmHeaderFileWriter extends ParamWriter{
public ParmHeaderFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -53,7 +56,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.8 +7 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AllParamWriter.java 9 Apr 2004 08:49:33 -0000 1.7
+++ AllParamWriter.java 8 Sep 2004 06:41:13 -0000 1.8
@@ -18,7 +18,9 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
+
package org.apache.axis.wsdl.wsdl2ws.c.literal;
import java.util.Iterator;
@@ -27,6 +29,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
/**
* Parameter genarator.. genarate all necessary param classes
@@ -52,7 +55,8 @@
type = (Type)enu.next();
if(wscontext.getWrapInfo().getImplStyle().equals(WrapperConstants.IMPL_STYLE_STRUCT)){
if(type.isArray()){
- System.out.println("Array writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("Array writer called ......");
(new ArrayParamWriter(wscontext,type)).writeSource();
}
else{
@@ -64,7 +68,8 @@
System.out.println("ignoring anonymous type "+ type.getLanguageSpecificName()+"\n");
}
else{
- System.out.println("struct writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("struct writer called ......");
(new BeanParamWriter(wscontext,type)).writeSource();
(new ParmHeaderFileWriter(wscontext,type)).writeSource();
}
1.10 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ArrayParamWriter.java 16 Aug 2004 09:22:49 -0000 1.9
+++ ArrayParamWriter.java 8 Sep 2004 06:41:13 -0000 1.10
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c.literal;
@@ -35,6 +36,7 @@
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.CUtils;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ArrayParamWriter extends ParamWriter{
public ArrayParamWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -63,7 +65,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.29 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/BeanParamWriter.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- BeanParamWriter.java 23 Aug 2004 00:45:31 -0000 1.28
+++ BeanParamWriter.java 8 Sep 2004 06:41:13 -0000 1.29
@@ -104,7 +104,7 @@
writer.write("int Axis_Serialize_"+classname+"("+classname+"* param, IWrapperSoapSerializer* pSZ, bool bArray)\n{\n");
if (attribs.length == 0) {
- System.out.println("possible error class with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\tpSZ->_functions->serialize(pSZ->_object, \">\");\n");
writer.write("\treturn AXIS_SUCCESS;\n");
writer.write("}\n\n");
@@ -174,7 +174,7 @@
writer.write("int Axis_DeSerialize_"+classname+"("+classname+"* param, IWrapperSoapDeSerializer* pDZ)\n{\n");
if (attribs.length == 0) {
//nothing to print if this is simple type we have inbuild types
- System.out.println("possible error calss with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
// compilation issue;
writer.write("\treturn AXIS_SUCCESS;\n");
writer.write("}\n\n");
1.5 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/CFileWriter.java
Index: CFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/CFileWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CFileWriter.java 9 Apr 2004 08:49:33 -0000 1.4
+++ CFileWriter.java 8 Sep 2004 06:41:14 -0000 1.5
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c.literal;
@@ -27,6 +28,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class CFileWriter extends BasicFileWriter{
public CFileWriter(String classname)throws WrapperFault{
@@ -45,7 +47,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.11 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClassLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClassLoader.java 14 Jun 2004 09:17:45 -0000 1.10
+++ ClassLoader.java 8 Sep 2004 06:41:14 -0000 1.11
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c.literal;
@@ -33,6 +34,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ClassLoader implements SourceWriter{
private Writer writer;
@@ -79,7 +81,8 @@
writer.write("}\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
}catch(IOException e){
throw new WrapperFault(e);
}
1.6 +5 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/HeaderFileWriter.java
Index: HeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/HeaderFileWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HeaderFileWriter.java 9 Apr 2004 08:49:33 -0000 1.5
+++ HeaderFileWriter.java 8 Sep 2004 06:41:14 -0000 1.6
@@ -17,7 +17,8 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
- * @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c.literal;
@@ -29,6 +30,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class HeaderFileWriter extends BasicFileWriter {
public HeaderFileWriter(String classname)throws WrapperFault{
@@ -51,7 +53,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.10 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java
Index: ParamCFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParamCFileWriter.java 12 Jun 2004 03:57:11 -0000 1.9
+++ ParamCFileWriter.java 8 Sep 2004 06:41:14 -0000 1.10
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c.literal;
@@ -31,6 +32,7 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class ParamCFileWriter extends ParamWriter{
public ParamCFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -54,7 +56,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.16 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/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:49 -0000 1.15
+++ ParmHeaderFileWriter.java 8 Sep 2004 06:41:14 -0000 1.16
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.c.literal;
@@ -38,6 +39,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ParmHeaderFileWriter extends ParamWriter{
public ParmHeaderFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -62,7 +64,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e){
e.printStackTrace();
throw new WrapperFault(e);
1.7 +6 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AllParamWriter.java 6 Jul 2004 07:16:03 -0000 1.6
+++ AllParamWriter.java 8 Sep 2004 06:41:14 -0000 1.7
@@ -18,6 +18,7 @@
* Parameter genarator.. genarate all necessary param classes
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp;
@@ -31,6 +32,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class AllParamWriter implements SourceWriter{
private WebServiceContext wscontext;
@@ -52,7 +54,8 @@
type = (Type)enu.next();
if(wscontext.getWrapInfo().getImplStyle().equals(WrapperConstants.IMPL_STYLE_STRUCT)){
if(type.isArray()){
- System.out.println("Array writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("Array writer called ......");
QName qname = type.getName();
if (CUtils.isSimpleType(qname) && !CUtils.isDefinedSimpleType(qname)){
throw new WrapperFault("No need to create an Array for simple type "+qname+"\n" +
@@ -70,7 +73,8 @@
System.out.println("ignoring anonymous type "+ type.getLanguageSpecificName()+"\n");
}
else{
- System.out.println("struct writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("struct writer called ......");
(new BeanParamWriter(wscontext,type)).writeSource();
(new ParmHeaderFileWriter(wscontext,type)).writeSource();
}
1.13 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ArrayParamWriter.java 16 Aug 2004 09:22:50 -0000 1.12
+++ ArrayParamWriter.java 8 Sep 2004 06:41:14 -0000 1.13
@@ -17,6 +17,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
@@ -35,6 +36,7 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ArrayParamWriter extends ParamWriter{
public ArrayParamWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -65,7 +67,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.23 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BeanParamWriter.java 22 Jul 2004 12:44:38 -0000 1.22
+++ BeanParamWriter.java 8 Sep 2004 06:41:14 -0000 1.23
@@ -91,7 +91,7 @@
writer.write(" */\n");
writer.write("int Axis_Serialize_"+classname+"("+classname+"* param, IWrapperSoapSerializer* pSZ, bool bArray = false)\n{\n");
if (attribs.length == 0) {
- System.out.println("possible error class with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\t}\n\n");
return;
}
@@ -152,7 +152,7 @@
writer.write(" */\n");
writer.write("int Axis_DeSerialize_"+classname+"("+classname+"* param, IWrapperSoapDeSerializer* pIWSDZ)\n{\n");
if (attribs.length == 0) {
- System.out.println("possible error class with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\t}\n\n");
return;
}
1.4 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java
Index: CPPClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CPPClassWriter.java 9 Apr 2004 08:49:33 -0000 1.3
+++ CPPClassWriter.java 8 Sep 2004 06:41:14 -0000 1.4
@@ -17,6 +17,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
@@ -28,6 +29,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class CPPClassWriter extends BasicFileWriter{
public CPPClassWriter(String classname)throws WrapperFault{
@@ -50,7 +52,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.3 +20 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPExceptionClassWriter.java
Index: CPPExceptionClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPExceptionClassWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CPPExceptionClassWriter.java 16 Aug 2004 09:22:50 -0000 1.2
+++ CPPExceptionClassWriter.java 8 Sep 2004 06:41:14 -0000 1.3
@@ -1,4 +1,20 @@
/*
+ * Copyright 2003-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /*
* Created on Jun 3, 2004
*
* To change the template for this generated file go to
@@ -11,9 +27,11 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
/**
* @author nithya
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
@@ -38,7 +56,8 @@
writeMethods();
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.13 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ClassLoader.java 14 Jun 2004 09:17:45 -0000 1.12
+++ ClassLoader.java 8 Sep 2004 06:41:14 -0000 1.13
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp;
@@ -33,6 +34,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ClassLoader implements SourceWriter{
private Writer writer;
@@ -82,7 +84,8 @@
writer.write("}\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
}catch(IOException e){
throw new WrapperFault(e);
}
1.53 +6 -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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ClientStubWriter.java 27 Aug 2004 01:24:59 -0000 1.52
+++ ClientStubWriter.java 8 Sep 2004 06:41:14 -0000 1.53
@@ -17,6 +17,7 @@
/**
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp;
@@ -39,6 +40,7 @@
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ClientStubWriter extends CPPClassWriter{
private WebServiceContext wscontext;
@@ -187,7 +189,8 @@
retType = wscontext.getTypemap().getType(returntype.getSchemaName());
if (retType != null){
returntypeisarray = retType.isArray();
- System.out.println(retType.getLanguageSpecificName()+"LanguageName .................... ");
+ if (WSDL2Ws.verbose)
+ System.out.println(retType.getLanguageSpecificName()+"LanguageName .................... ");
if (CUtils.isSimpleType(retType.getLanguageSpecificName())){
returntypeissimple = true;
}
@@ -205,7 +208,8 @@
writer.write("void");
}else{
writer.write(outparamTypeName);
- System.out.println("Output Parameter type Name :"+outparamTypeName);
+ if (WSDL2Ws.verbose)
+ System.out.println("Output Parameter type Name :"+outparamTypeName);
}
writer.write(" "+classname+"::" + methodName + "(");
ArrayList paramsB = (ArrayList)params;
1.6 +6 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExceptionHeaderWriter.java 16 Aug 2004 09:22:50 -0000 1.5
+++ ExceptionHeaderWriter.java 8 Sep 2004 06:41:15 -0000 1.6
@@ -25,10 +25,13 @@
import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
+
/**
* @author nithya
- *
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
+
public class ExceptionHeaderWriter extends HeaderFileWriter{
private WebServiceContext wscontext;
@@ -38,7 +41,8 @@
public ExceptionHeaderWriter(WebServiceContext wscontext,String faultInfoName)throws WrapperFault{
//super(WrapperUtils.getClassNameFromFullyQualifiedName(wscontext.getSerInfo().getQualifiedServiceName()));
super("Axis"+faultInfoName+"Exception");//damitha
- System.out.println("faultInfoName is:"+faultInfoName);
+ if (WSDL2Ws.verbose)
+ System.out.println("faultInfoName is:"+faultInfoName);
this.wscontext = wscontext;
this.methods = wscontext.getSerInfo().getMethods();
this.faultInfoName ="Axis"+faultInfoName+"Exception" ;
1.11 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java
Index: HeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HeaderFileWriter.java 16 Aug 2004 09:22:50 -0000 1.10
+++ HeaderFileWriter.java 8 Sep 2004 06:41:15 -0000 1.11
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp;
@@ -29,6 +30,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class HeaderFileWriter extends BasicFileWriter {
public HeaderFileWriter(String classname)throws WrapperFault{
@@ -65,7 +67,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.10 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java
Index: ParamCPPFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParamCPPFileWriter.java 16 Aug 2004 09:22:50 -0000 1.9
+++ ParamCPPFileWriter.java 8 Sep 2004 06:41:15 -0000 1.10
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp;
@@ -31,6 +32,7 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class ParamCPPFileWriter extends ParamWriter{
public ParamCPPFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -53,7 +55,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.18 +4 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ParmHeaderFileWriter.java 16 Aug 2004 09:22:50 -0000 1.17
+++ ParmHeaderFileWriter.java 8 Sep 2004 06:41:15 -0000 1.18
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp;
@@ -33,6 +34,7 @@
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ParmHeaderFileWriter extends ParamWriter{
public ParmHeaderFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -54,7 +56,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.7 +6 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AllParamWriter.java 6 Jul 2004 07:16:03 -0000 1.6
+++ AllParamWriter.java 8 Sep 2004 06:41:15 -0000 1.7
@@ -19,6 +19,7 @@
* Parameter genarator.. genarate all necessary param classes
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp.literal;
@@ -32,6 +33,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class AllParamWriter implements SourceWriter{
private WebServiceContext wscontext;
@@ -53,7 +55,8 @@
type = (Type)enu.next();
if(wscontext.getWrapInfo().getImplStyle().equals(WrapperConstants.IMPL_STYLE_STRUCT)){
if(type.isArray()){
- System.out.println("Array writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("Array writer called ......");
QName qname = type.getName();
if (CUtils.isSimpleType(qname) && !CUtils.isDefinedSimpleType(qname)){
throw new WrapperFault("No need to create an Array for simple type "+qname+"\n" +
@@ -71,7 +74,8 @@
System.out.println("ignoring anonymous type "+ type.getLanguageSpecificName()+"\n");
}
else{
- System.out.println("struct writer called ......");
+ if (WSDL2Ws.verbose)
+ System.out.println("struct writer called ......");
(new BeanParamWriter(wscontext,type)).writeSource();
(new ParmHeaderFileWriter(wscontext,type)).writeSource();
}
1.9 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ArrayParamWriter.java
Index: ArrayParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ArrayParamWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ArrayParamWriter.java 16 Aug 2004 09:22:52 -0000 1.8
+++ ArrayParamWriter.java 8 Sep 2004 06:41:15 -0000 1.9
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
@@ -36,6 +37,7 @@
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ArrayParamWriter extends ParamWriter{
public ArrayParamWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -77,7 +79,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.27 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- BeanParamWriter.java 30 Aug 2004 05:39:40 -0000 1.26
+++ BeanParamWriter.java 8 Sep 2004 06:41:15 -0000 1.27
@@ -103,7 +103,7 @@
writer.write(" */\n");
writer.write("int Axis_Serialize_"+classname+"("+classname+"* param, IWrapperSoapSerializer* pSZ, bool bArray = false)\n{\n");
if (attribs.length == 0) {
- System.out.println("possible error class with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\tpSZ->serialize(\">\", NULL);\n");
if (extensionBaseAttrib != null){
writer.write("\tpSZ->serializeAsChardata((void*)&(param->"+extensionBaseAttrib.getParamName()+"), "+CUtils.getXSDTypeForBasicType(extensionBaseAttrib.getTypeName())+");\n");
@@ -193,7 +193,7 @@
writer.write(" */\n");
writer.write("int Axis_DeSerialize_"+classname+"("+classname+"* param, IWrapperSoapDeSerializer* pIWSDZ)\n{\n");
if (attribs.length == 0) {
- System.out.println("possible error class with no attributes....................");
+ System.out.println("Possible error in class " + classname + ": class with no attributes....................");
writer.write("\treturn AXIS_SUCCESS;\n");
writer.write("}\n\n");
return;
1.5 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/CPPClassWriter.java
Index: CPPClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/CPPClassWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CPPClassWriter.java 9 Apr 2004 08:49:34 -0000 1.4
+++ CPPClassWriter.java 8 Sep 2004 06:41:15 -0000 1.5
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
@@ -29,6 +30,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class CPPClassWriter extends BasicFileWriter{
public CPPClassWriter(String classname)throws WrapperFault{
@@ -51,7 +53,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.11 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClassLoader.java
Index: ClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClassLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClassLoader.java 14 Jun 2004 09:17:45 -0000 1.10
+++ ClassLoader.java 8 Sep 2004 06:41:15 -0000 1.11
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp.literal;
@@ -33,6 +34,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
import org.apache.axis.wsdl.wsdl2ws.CUtils;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ClassLoader implements SourceWriter{
private Writer writer;
@@ -82,7 +84,8 @@
writer.write("}\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
}catch(IOException e){
throw new WrapperFault(e);
}
1.7 +3 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/HeaderFileWriter.java
Index: HeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/HeaderFileWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HeaderFileWriter.java 27 May 2004 09:34:34 -0000 1.6
+++ HeaderFileWriter.java 8 Sep 2004 06:41:15 -0000 1.7
@@ -35,6 +35,7 @@
import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
import org.apache.axis.wsdl.wsdl2ws.BasicFileWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class HeaderFileWriter extends BasicFileWriter {
public HeaderFileWriter(String classname)throws WrapperFault{
@@ -60,7 +61,8 @@
//cleanup
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
1.13 +4 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java
Index: ParamCPPFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ParamCPPFileWriter.java 12 Jun 2004 03:57:12 -0000 1.12
+++ ParamCPPFileWriter.java 8 Sep 2004 06:41:15 -0000 1.13
@@ -18,6 +18,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp.literal;
@@ -31,6 +32,7 @@
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public abstract class ParamCPPFileWriter extends ParamWriter{
public ParamCPPFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -58,7 +60,8 @@
}
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);
1.19 +4 -1 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ParmHeaderFileWriter.java 23 Aug 2004 05:09:06 -0000 1.18
+++ ParmHeaderFileWriter.java 8 Sep 2004 06:41:15 -0000 1.19
@@ -17,6 +17,7 @@
/**
* @author Srinath Perera(hemapani@openource.lk)
* @author Susantha Kumara(susantha@opensource.lk, skumara@virtusa.com)
+ * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
package org.apache.axis.wsdl.wsdl2ws.cpp.literal;
@@ -37,6 +38,7 @@
import org.apache.axis.wsdl.wsdl2ws.info.Type;
import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
import org.apache.axis.wsdl.wsdl2ws.ParamWriter;
+import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
public class ParmHeaderFileWriter extends ParamWriter{
public ParmHeaderFileWriter(WebServiceContext wscontext,Type type)throws WrapperFault{
@@ -63,7 +65,8 @@
this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
writer.flush();
writer.close();
- System.out.println(getFilePath().getAbsolutePath() + " created.....");
+ if (WSDL2Ws.verbose)
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
} catch (IOException e) {
e.printStackTrace();
throw new WrapperFault(e);