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 wh...@apache.org on 2004/11/04 15:42:22 UTC
cvs commit: ws-axis/c/tools/trace/org/apache/axis/tracetool Exclusions.java Parameter.java Signature.java
whitlock 2004/11/04 06:42:22
Modified: c/src/soap Attribute.cpp SoapDeSerializer.cpp SoapFault.cpp
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
WrapHeaderWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
WrapHeaderWriter.java
c/tools/trace/org/apache/axis/tracetool Exclusions.java
Parameter.java Signature.java
Log:
Revision Changes Path
1.28 +2 -1 ws-axis/c/src/soap/Attribute.cpp
Index: Attribute.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Attribute.cpp 2 Nov 2004 13:53:31 -0000 1.27
+++ Attribute.cpp 4 Nov 2004 14:42:21 -0000 1.28
@@ -107,7 +107,8 @@
Attribute::Attribute(const Attribute& rCopy)
{
- this->m_localname= rCopy.m_localname; //in casse sting is changed to char* use strdup here
+ //in case sting is changed to char* use new[] and strcpy here
+ this->m_localname= rCopy.m_localname;
this->m_prefix= rCopy.m_prefix;
this->m_uri= rCopy.m_uri;
this->m_value= rCopy.m_value;
1.96 +3 -1 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- SoapDeSerializer.cpp 2 Nov 2004 13:53:31 -0000 1.95
+++ SoapDeSerializer.cpp 4 Nov 2004 14:42:21 -0000 1.96
@@ -692,9 +692,11 @@
#define CONV_STRTOD(str) strtod(str, &m_pEndptr)
#define CONV_STRTODATETIME(str) AxisTime::deserialize(str, nType)
#define CONV_STRTODURATION(str) AxisTime::deserializeDuration(str, nType)
-#define CONV_STRDUP(str) strdup(str)
+#define CONV_STRDUP(str) AxisSoapDeSerializerStringCopy(str)
#define CONV_STRTOBASE64BINARY(str) decodeFromBase64Binary(str)
#define CONV_STRTOHEXBINARY(str) decodeFromHexBinary(str)
+
+char *AxisSoapDeSerializerStringCopy(const char *s1) { char *s2=new char[strlen(s1)+1]; strcpy(s2,s1); return s2; }
#define INIT_VALUE_DATETIME {0,0,0,0,0,0,0,0,0}
#define INIT_VALUE_NUMBER 0
1.39 +2 -1 ws-axis/c/src/soap/SoapFault.cpp
Index: SoapFault.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- SoapFault.cpp 26 Oct 2004 10:40:56 -0000 1.38
+++ SoapFault.cpp 4 Nov 2004 14:42:21 -0000 1.39
@@ -278,7 +278,8 @@
pParam->m_Type = type;
pParam->m_sName = pchName;
//pParam->m_Value.pStrValue = *((char**)(pValue));
- pParam->m_Value.pStrValue = strdup((char*)(pValue));
+ pParam->m_Value.pStrValue = new char[strlen((const char*)pValue)+1];
+ strcpy((char*)(pParam->m_Value.pStrValue),(const char*)pValue);
return AXIS_SUCCESS;
}
1.22 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
Index: WrapHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WrapHeaderWriter.java 4 Nov 2004 14:06:23 -0000 1.21
+++ WrapHeaderWriter.java 4 Nov 2004 14:42:21 -0000 1.22
@@ -178,7 +178,7 @@
writer.write("#include <axis/server/IMessageData.hpp>\n");
writer.write("#include <axis/server/GDefine.hpp>\n");
writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n");
- writer.write("#include \"AxisServiceException.hpp\" \n");
+ writer.write("#include \"AxisServiceException.h\" \n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
//writeFaultHeaders();
1.18 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapHeaderWriter.java
Index: WrapHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapHeaderWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WrapHeaderWriter.java 4 Nov 2004 14:06:24 -0000 1.17
+++ WrapHeaderWriter.java 4 Nov 2004 14:42:21 -0000 1.18
@@ -173,7 +173,7 @@
writer.write("#include <axis/server/IMessageData.hpp>\n");
writer.write("#include <axis/server/GDefine.hpp>\n");
writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n");
- writer.write("#include \"AxisServiceException.hpp\" \n");
+ writer.write("#include \"AxisServiceException.h\" \n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
//writeFaultHeaders();
1.6 +0 -11 ws-axis/c/tools/trace/org/apache/axis/tracetool/Exclusions.java
Index: Exclusions.java
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/Exclusions.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Exclusions.java 1 Nov 2004 14:12:07 -0000 1.5
+++ Exclusions.java 4 Nov 2004 14:42:21 -0000 1.6
@@ -44,17 +44,6 @@
"Channel.hpp",
"Channel.h",
"Channel.cpp",
- "Call.h",
- "AxisConfig.h",
- "AxisTransport.h",
- "ClientAxisEngine.h",
- "SOAPTransportFactory.h",
- "SOAPTransport.h",
- "SoapSerializer.h",
- "SoapDeSerializer.h",
- "HeaderBlock.h",
- "SoapSerializer.cpp", // fails on "..."
-
// Axis.cpp contains a copyright sign (circle with a "C" in it) which
// makes readline throw a MalformedInputException on linux possibly due to
// locale/charset problems.
1.3 +4 -0 ws-axis/c/tools/trace/org/apache/axis/tracetool/Parameter.java
Index: Parameter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/Parameter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Parameter.java 27 Sep 2004 15:33:46 -0000 1.2
+++ Parameter.java 4 Nov 2004 14:42:21 -0000 1.3
@@ -134,6 +134,10 @@
return 0 == type.size();
}
+ boolean isDotDotDot() {
+ return 1 == type.size() && "...".equals(type.get(0));
+ }
+
public String toString() {
if (0 == type.size())
return "void";
1.3 +2 -1 ws-axis/c/tools/trace/org/apache/axis/tracetool/Signature.java
Index: Signature.java
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/Signature.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Signature.java 27 Sep 2004 15:33:46 -0000 1.2
+++ Signature.java 4 Nov 2004 14:42:21 -0000 1.3
@@ -310,7 +310,8 @@
}
// Copes with void func(void)
- if (!p.isVoid())
+ // TODO: Cope with ...
+ if (!p.isVoid() && !p.isDotDotDot())
alParams.add(p);
}