You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2008/08/22 18:48:00 UTC
svn commit: r688116 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/
c/literal/ cpp/ cpp/literal/
Author: nadiramra
Date: Fri Aug 22 09:47:59 2008
New Revision: 688116
URL: http://svn.apache.org/viewvc?rev=688116&view=rev
Log:
Simplify, remove redundant/unused code.
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/CUtils.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/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/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/CPPClassWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.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/ServiceHeaderWriter.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=688116&r1=688115&r2=688116&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 09:47:59 2008
@@ -41,6 +41,9 @@
protected void writeConstructors()throws WrapperFault {};
protected void writeDestructors()throws WrapperFault {};
protected abstract void writeMethods()throws WrapperFault;
- protected abstract File getFilePath()throws WrapperFault;
+ protected File getFilePath() throws WrapperFault
+ {
+ return getFilePath(false);
+ }
protected abstract File getFilePath(boolean b)throws WrapperFault;
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java Fri Aug 22 09:47:59 2008
@@ -53,13 +53,13 @@
public static final QName anyTypeQname = new QName("http://ws.apache.org/axisc/types","AnyType");
// File suffix for C++ Class files
- public static final String CPP_CLASS_SUFFIX = ".cpp";
+ private static final String CPP_CLASS_SUFFIX = ".cpp";
// File suffix for C++ Header files
- public static final String CPP_HEADER_SUFFIX = ".hpp";
+ private static final String CPP_HEADER_SUFFIX = ".hpp";
// File suffix for C Source files
- public static final String C_FILE_SUFFIX = ".c";
+ private static final String C_FILE_SUFFIX = ".c";
// File suffix fr C Header files
- public static final String C_HEADER_SUFFIX = ".h";
+ private static final String C_HEADER_SUFFIX = ".h";
// Valid XML but invalid or reserved C/C++ characters
private static final char c_invalidCChars[] = {
@@ -68,6 +68,10 @@
'|', '}', '~', '[', ']', '\u00A3'
};
+ private static String c_fileExtension = CPP_CLASS_SUFFIX;
+ private static String c_headerFileExtension = CPP_HEADER_SUFFIX;
+
+
// Contains all primitive types.
private static HashSet c_primitiveTypes = null;
@@ -666,12 +670,19 @@
c_qnameToPrimitiveTypeMapper = c_qnameToPrimitiveTypeMapperC;
c_getAttributeAs = "GetAttributeAs";
c_getElementAs = "GetElementAs";
+
+ c_fileExtension = C_FILE_SUFFIX;
+ c_headerFileExtension = C_HEADER_SUFFIX;
+
}
else if (WrapperConstants.LANGUAGE_CPP.equalsIgnoreCase(language))
{
c_qnameToPrimitiveTypeMapper = c_qnameToPrimitiveTypeMapperCPP;
c_getAttributeAs = "getAttributeAs";
c_getElementAs = "getElementAs";
+
+ c_fileExtension = CPP_CLASS_SUFFIX;
+ c_headerFileExtension = CPP_HEADER_SUFFIX;
}
else
throw new WrapperFault("Unsupported language.");
@@ -1249,6 +1260,24 @@
throw new WrapperFault("Array type do not have any attibutes");
}
+ /**
+ * Returns the implementation file extension for a file (i.e. ".c" or ".cpp").
+ *
+ * @return the c_fileExtension
+ */
+ public static String getImplFileExtension()
+ {
+ return c_fileExtension;
+ }
+ /**
+ * Returns header file extension for a file (i.e. ".h" or ".hpp").
+ *
+ * @return the c_headerFileExtension
+ */
+ public static String getHeaderFileExtension()
+ {
+ return c_headerFileExtension;
+ }
}
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=688116&r1=688115&r2=688116&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 09:47:59 2008
@@ -88,23 +88,18 @@
return CUtils.isSimpleType(qname);
}
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.C_HEADER_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getHeaderFileExtension();
if (useServiceName)
{
fileName = targetOutputLocation + "/"
+ this.wscontext.getServiceInfo().getServicename()
- + "_" + classname + CUtils.C_HEADER_SUFFIX;
+ + "_" + classname + CUtils.getHeaderFileExtension();
}
return new File(fileName);
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=688116&r1=688115&r2=688116&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 09:47:59 2008
@@ -74,7 +74,7 @@
// include header file for the contained type
QName qname = CUtils.getArrayType(type).getName();
if (!CUtils.isSimpleType(qname))
- writer.write("#include \"" + attribs[0].getTypeName() + CUtils.C_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + attribs[0].getTypeName() + CUtils.getHeaderFileExtension() + "\"\n");
this.writer.write("\n");
writer.write("\n");
@@ -204,14 +204,6 @@
throw new WrapperFault(e);
}
}
-
- /* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath()
- */
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
/* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath(boolean)
@@ -221,14 +213,7 @@
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.C_FILE_SUFFIX;
-
- if (useServiceName)
- {
- fileName = targetOutputLocation + "/"
- + this.wscontext.getServiceInfo().getServicename()
- + "_" + classname + CUtils.C_HEADER_SUFFIX;
- }
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getImplFileExtension();
return new File(fileName);
}
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=688116&r1=688115&r2=688116&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 09:47:59 2008
@@ -78,30 +78,22 @@
{}
/* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath()
- */
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
- /* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath(boolean)
*/
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.C_FILE_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getImplFileExtension();
if (useServiceName)
{
String serviceName = this.wscontext.getServiceInfo().getServicename();
- fileName = targetOutputLocation + "/" + serviceName + "_" + classname + CUtils.C_FILE_SUFFIX;
- this.wscontext.addGeneratedFile(serviceName + "_" + classname + CUtils.C_FILE_SUFFIX);
+ fileName = targetOutputLocation + "/" + serviceName + "_" + classname + CUtils.getImplFileExtension();
+ this.wscontext.addGeneratedFile(serviceName + "_" + classname + CUtils.getImplFileExtension());
}
else
- this.wscontext.addGeneratedFile(classname + CUtils.C_FILE_SUFFIX);
+ this.wscontext.addGeneratedFile(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=688116&r1=688115&r2=688116&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 09:47:59 2008
@@ -241,7 +241,7 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + CUtils.C_HEADER_SUFFIX+"\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension()+"\"\n");
}
writer.write("\n");
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Fri Aug 22 09:47:59 2008
@@ -134,7 +134,7 @@
writer.write("#include <string.h>\n");
writer.write("\n");
- writer.write("#include \"" + classname + CUtils.C_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + classname + CUtils.getHeaderFileExtension() + "\"\n");
writer.write("\n");
writer.write("#include <axis/client/Stub.h>\n");
writer.write("#include <axis/client/Call.h>\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/HeaderFileWriter.java Fri Aug 22 09:47:59 2008
@@ -88,14 +88,6 @@
}
/* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath()
- */
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
- /* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath(boolean)
*/
protected File getFilePath(boolean useServiceName) throws WrapperFault
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java Fri Aug 22 09:47:59 2008
@@ -100,8 +100,8 @@
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + this.classname + CUtils.C_FILE_SUFFIX;
- this.wscontext.addGeneratedFile(classname + CUtils.C_FILE_SUFFIX);
+ String fileName = targetOutputLocation + "/" + this.classname + CUtils.getImplFileExtension();
+ this.wscontext.addGeneratedFile(classname + CUtils.getImplFileExtension());
return new File(fileName);
}
@@ -116,7 +116,7 @@
writer.write("#include <string.h>\n");
writer.write("\n");
- writer.write("#include \"" + this.classname + CUtils.C_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + this.classname + CUtils.getHeaderFileExtension() + "\"\n");
writer.write("\n");
writer.write("#include <axis/client/Stub.h>\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java Fri Aug 22 09:47:59 2008
@@ -322,14 +322,6 @@
{}
/* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath()
- */
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
- /* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath(boolean)
*/
protected File getFilePath(boolean useServiceName) throws WrapperFault
@@ -337,13 +329,13 @@
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.C_HEADER_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getHeaderFileExtension();
if (useServiceName)
{
fileName = targetOutputLocation + "/"
+ this.wscontext.getServiceInfo().getServicename() + "_"
- + classname + CUtils.C_HEADER_SUFFIX;
+ + classname + CUtils.getHeaderFileExtension();
}
return new File(fileName);
@@ -463,7 +455,7 @@
// Do not want to include the header file we are generating!
String includeFile = itr.next().toString();
if (!includeFile.equals(classname))
- writer.write("#include \"" + includeFile + CUtils.C_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + includeFile + CUtils.getHeaderFileExtension() + "\"\n");
}
writer.write("\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -224,7 +224,7 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + CUtils.C_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension() + "\"\n");
}
writer.write("\n");
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -93,23 +93,18 @@
return CUtils.isSimpleType(qname);
}
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getHeaderFileExtension();
if (useServiceName)
{
fileName = targetOutputLocation + "/"
+ this.wscontext.getServiceInfo().getServicename()
- + "_" + classname + CUtils.CPP_HEADER_SUFFIX;
+ + "_" + classname + CUtils.getHeaderFileExtension();
}
return new File(fileName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java Fri Aug 22 09:47:59 2008
@@ -257,14 +257,6 @@
throw new WrapperFault(e);
}
}
-
- /* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath()
- */
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
/* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath(boolean)
@@ -274,13 +266,13 @@
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.CPP_CLASS_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getImplFileExtension();
if (useServiceName)
{
fileName = targetOutputLocation + "/"
+ this.wscontext.getServiceInfo().getServicename()
- + "_" + classname + CUtils.CPP_HEADER_SUFFIX;
+ + "_" + classname + CUtils.getHeaderFileExtension();
}
return new File(fileName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/CPPClassWriter.java Fri Aug 22 09:47:59 2008
@@ -77,26 +77,21 @@
protected WebServiceContext wscontext;
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.CPP_CLASS_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getImplFileExtension();
if (useServiceName)
{
String serviceName = this.wscontext.getServiceInfo().getServicename();
- fileName = targetOutputLocation + "/" + serviceName + "_" + classname + CUtils.CPP_CLASS_SUFFIX;
- this.wscontext.addGeneratedFile(serviceName + "_" + classname + CUtils.CPP_CLASS_SUFFIX);
+ fileName = targetOutputLocation + "/" + serviceName + "_" + classname + CUtils.getImplFileExtension();
+ this.wscontext.addGeneratedFile(serviceName + "_" + classname + CUtils.getImplFileExtension());
}
else
{
- this.wscontext.addGeneratedFile(classname + CUtils.CPP_CLASS_SUFFIX);
+ this.wscontext.addGeneratedFile(classname + CUtils.getImplFileExtension());
}
return new File(fileName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java Fri Aug 22 09:47:59 2008
@@ -74,7 +74,7 @@
writer.write(
"#include \""
+ wrappername
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\" \n");
writer.write("extern \"C\" {\n");
writer.write("STORAGE_CLASS_INFO\n");
@@ -125,8 +125,8 @@
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
String fileName = targetOutputLocation
- + "/" + classname + CUtils.CLASS_LOADER_APPENDER + CUtils.CPP_CLASS_SUFFIX;
- this.wscontext.addGeneratedFile(classname + CUtils.CLASS_LOADER_APPENDER + CUtils.CPP_CLASS_SUFFIX);
+ + "/" + classname + CUtils.CLASS_LOADER_APPENDER + CUtils.getImplFileExtension();
+ this.wscontext.addGeneratedFile(classname + CUtils.CLASS_LOADER_APPENDER + CUtils.getImplFileExtension());
return new File(fileName);
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -222,7 +222,7 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension() + "\"\n");
}
//Method to print the Fault Exception headers
@@ -255,7 +255,7 @@
faultInfoName = info.getFaultInfo();
writer.write(
"#include \"Axis" + faultInfoName.toString()
- + "Exception" + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ + "Exception" + CUtils.getHeaderFileExtension() + "\"\n");
}
writer.write("\n");
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Fri Aug 22 09:47:59 2008
@@ -159,10 +159,10 @@
if ("AxisClientException".equals(classname))
{
writer.write("#include \"" + getServiceName() + "_" + classname
- + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
+ + CUtils.getHeaderFileExtension() + "\"\n\n");
}
else
- writer.write("#include \"" + classname + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
+ writer.write("#include \"" + classname + CUtils.getHeaderFileExtension() + "\"\n\n");
writer.write("#include <axis/AxisWrapperAPI.hpp>\n");
writer.write ("#include <axis/Axis.hpp>\n\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -50,17 +50,12 @@
this.faultInfoName = "Axis" + faultInfoName + "Exception";
}
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + faultInfoName + CUtils.CPP_HEADER_SUFFIX;
+ String fileName = targetOutputLocation + "/" + faultInfoName + CUtils.getHeaderFileExtension();
if (useServiceName)
{
@@ -70,7 +65,7 @@
+ this.wscontext.getServiceInfo().getServicename()
+ "_"
+ faultInfoName
- + CUtils.CPP_HEADER_SUFFIX;
+ + CUtils.getHeaderFileExtension();
}
return new File(fileName);
@@ -218,7 +213,7 @@
writer.write(
"#include \""
+ langName
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n\n");
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java Fri Aug 22 09:47:59 2008
@@ -50,14 +50,6 @@
}
/* (non-Javadoc)
- * @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath()
- */
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
- /* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.BasicFileWriter#getFilePath(boolean)
*/
protected File getFilePath(boolean useServiceName) throws WrapperFault
@@ -65,16 +57,16 @@
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + faultInfoName + CUtils.CPP_CLASS_SUFFIX;
+ String fileName = targetOutputLocation + "/" + faultInfoName + CUtils.getImplFileExtension();
if (useServiceName)
{
- fileName = targetOutputLocation + "/" + this.getServiceName() + "_" + faultInfoName + CUtils.CPP_CLASS_SUFFIX;
- this.wscontext.addGeneratedFile(this.getServiceName() + "_" + faultInfoName + CUtils.CPP_CLASS_SUFFIX);
+ fileName = targetOutputLocation + "/" + this.getServiceName() + "_" + faultInfoName + CUtils.getImplFileExtension();
+ this.wscontext.addGeneratedFile(this.getServiceName() + "_" + faultInfoName + CUtils.getImplFileExtension());
}
else
{
- this.wscontext.addGeneratedFile(faultInfoName + CUtils.CPP_CLASS_SUFFIX);
+ this.wscontext.addGeneratedFile(faultInfoName + CUtils.getImplFileExtension());
}
return new File(fileName);
}
@@ -98,7 +90,7 @@
+ getServiceName()
+ "_"
+ faultInfoName
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n\n");
}
else
@@ -106,7 +98,7 @@
writer.write(
"#include \""
+ faultInfoName
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n\n");
}
writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/HeaderFileWriter.java Fri Aug 22 09:47:59 2008
@@ -114,20 +114,16 @@
protected abstract String getExtendsPart(); //{return " ";}
protected abstract String getFileType();
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getHeaderFileExtension();
if (useServiceName)
{
- fileName = targetOutputLocation + "/" + this.getServiceName() + "_" + classname + CUtils.CPP_HEADER_SUFFIX;
+ fileName = targetOutputLocation + "/" + this.getServiceName() + "_" + classname + CUtils.getHeaderFileExtension();
}
return new File(fileName);
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java Fri Aug 22 09:47:59 2008
@@ -89,8 +89,8 @@
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + this.classname + CUtils.CPP_CLASS_SUFFIX;
- this.wscontext.addGeneratedFile(classname + CUtils.CPP_CLASS_SUFFIX);
+ String fileName = targetOutputLocation + "/" + this.classname + CUtils.getImplFileExtension();
+ this.wscontext.addGeneratedFile(classname + CUtils.getImplFileExtension());
return new File(fileName);
}
@@ -104,7 +104,7 @@
writer.write("#include <axis/UnknownElementException.hpp>\n");
writer.write("#include <axis/AxisWrapperAPI.hpp>\n");
writer.write("#include <axis/Axis.hpp>\n\n");
- writer.write("#include \"" + this.classname + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + this.classname + CUtils.getHeaderFileExtension() + "\"\n");
}
catch (IOException e)
{
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java Fri Aug 22 09:47:59 2008
@@ -470,23 +470,18 @@
{
}
- protected File getFilePath() throws WrapperFault
- {
- return this.getFilePath(false);
- }
-
protected File getFilePath(boolean useServiceName) throws WrapperFault
{
String targetOutputLocation = this.wscontext.getWrapperInfo().getTargetOutputLocation();
new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + classname + CUtils.CPP_HEADER_SUFFIX;
+ String fileName = targetOutputLocation + "/" + classname + CUtils.getHeaderFileExtension();
if (useServiceName)
{
fileName = targetOutputLocation + "/"
+ this.wscontext.getServiceInfo().getServicename() + "_"
- + classname + CUtils.CPP_HEADER_SUFFIX;
+ + classname + CUtils.getHeaderFileExtension();
}
return new File(fileName);
@@ -588,7 +583,7 @@
// Do not want to include the header file we are generating!
String includeFile = itr.next().toString();
if (!includeFile.equals(classname))
- writer.write("#include \"" + includeFile + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + includeFile + CUtils.getHeaderFileExtension() + "\"\n");
}
writer.write("\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -58,7 +58,7 @@
writer.write(
" * "
+ classname
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ ": interface for the "
+ classname
+ "class.\n");
@@ -308,7 +308,7 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension() + "\"\n");
}
//writeFaultHeaders();
writer.write("\n");
@@ -341,7 +341,7 @@
"#include \"Axis"
+ faultInfoName.toString()
+ "Exception"
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n");
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java Fri Aug 22 09:47:59 2008
@@ -292,7 +292,7 @@
writer.write(
"#include \""
+ classname
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n\n");
}
catch (IOException e)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -154,7 +154,7 @@
writer.write("#include \""
+ CUtils.getWebServiceNameFromWrapperName(classname)
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n");
writer.write("#include \"AxisServiceException.hpp\" \n\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
@@ -188,7 +188,7 @@
"#include \"Axis"
+ faultInfoName.toString()
+ "Exception"
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n");
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java Fri Aug 22 09:47:59 2008
@@ -154,7 +154,7 @@
writer.write(
"#include \""
+ classname
- + CUtils.CPP_HEADER_SUFFIX
+ + CUtils.getHeaderFileExtension()
+ "\"\n\n");
}
catch (IOException e)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -216,7 +216,7 @@
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write("#include \"" + itr.next().toString() + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension() + "\"\n");
}
// Method to print the Fault Exception headers
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java?rev=688116&r1=688115&r2=688116&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java Fri Aug 22 09:47:59 2008
@@ -116,7 +116,7 @@
while (itr.hasNext())
{
writer.write(
- "#include \"" + itr.next().toString() + CUtils.CPP_HEADER_SUFFIX + "\"\n");
+ "#include \"" + itr.next().toString() + CUtils.getHeaderFileExtension() + "\"\n");
}
//writeFaultHeaders();