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 di...@apache.org on 2005/03/04 14:51:42 UTC
cvs commit: ws-axis/c/tests/auto_build/testcases/output XSDElement.expected
dicka 2005/03/04 05:51:42
Modified: c/src/soap/xsd AnyURI.cpp AnyURI.hpp Base64Binary.hpp
Boolean.hpp Byte.cpp Byte.hpp Date.cpp Date.hpp
DateTime.cpp DateTime.hpp Decimal.cpp Decimal.hpp
Double.cpp Double.hpp Duration.cpp Duration.hpp
Float.cpp Float.hpp IAnySimpleType.hpp Int.cpp
Int.hpp Integer.cpp Integer.hpp Long.cpp Long.hpp
NOTATION.cpp NOTATION.hpp Short.cpp Short.hpp
String.cpp String.hpp Time.cpp Time.hpp
UnsignedByte.cpp UnsignedByte.hpp UnsignedInt.cpp
UnsignedInt.hpp UnsignedLong.cpp UnsignedLong.hpp
UnsignedShort.cpp XSD_QName.cpp XSD_QName.hpp
c/tests/auto_build/testcases/client/cpp XSDElementClient.cpp
XSDElementNilClient.cpp
c/tests/auto_build/testcases/output XSDElement.expected
Log:
Correct problems with xsd:duration deserialization and add test within XSDElement and XSDElementNil. Correct problem with xsd:long on AIX within these tests.
Also tidy up the xsd objects to use the xsd__* typedefs in AxisUserAPI.hpp to make code more readable.
PR: AXISCPP-502 and AXISCPP-503
Submitted by: Adrian Dick
Revision Changes Path
1.9 +2 -2 ws-axis/c/src/soap/xsd/AnyURI.cpp
Index: AnyURI.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/AnyURI.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AnyURI.cpp 2 Mar 2005 09:51:34 -0000 1.8
+++ AnyURI.cpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -8,7 +8,7 @@
AxisChar* AnyURI::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((AxisChar*) value);
+ return serialize((xsd__anyURI) value);
}
void* AnyURI::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeAnyURI(valueAsChar);
}
- AxisChar* AnyURI::serialize(const AxisChar* value) throw (AxisSoapException)
+ AxisChar* AnyURI::serialize(const xsd__anyURI value) throw (AxisSoapException)
{
MinLength* minLength= getMinLength();
if (minLength->isSet())
1.6 +3 -3 ws-axis/c/src/soap/xsd/AnyURI.hpp
Index: AnyURI.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/AnyURI.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AnyURI.hpp 25 Jan 2005 12:04:51 -0000 1.5
+++ AnyURI.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -58,14 +58,14 @@
* @param value The AnyURI value to be serialized.
* @return Serialized form of AnyURI value.
*/
- AxisChar* serialize(const AxisChar* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__anyURI value) throw (AxisSoapException);
/**
* Deserialized AnyURI value from it's on-the-wire string form.
* @param valueAsChar Serialized form of AnyURI value.
* @return Deserialized AnyURI value.
*/
- AxisChar* deserializeAnyURI(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__anyURI deserializeAnyURI(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -97,7 +97,7 @@
Length* getLength();
private:
- AxisChar* m_AnyURI;
+ xsd__anyURI m_AnyURI;
};
AXIS_CPP_NAMESPACE_END
1.8 +0 -1 ws-axis/c/src/soap/xsd/Base64Binary.hpp
Index: Base64Binary.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Base64Binary.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Base64Binary.hpp 18 Feb 2005 11:11:20 -0000 1.7
+++ Base64Binary.hpp 4 Mar 2005 13:51:40 -0000 1.8
@@ -24,7 +24,6 @@
#include "IAnySimpleType.hpp"
#include "../apr_base64.h"
-#include <axis/AxisUserAPI.hpp>
#include "constraints/MinLength.hpp"
#include "constraints/MaxLength.hpp"
#include "constraints/Length.hpp"
1.6 +0 -1 ws-axis/c/src/soap/xsd/Boolean.hpp
Index: Boolean.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Boolean.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Boolean.hpp 18 Feb 2005 11:11:20 -0000 1.5
+++ Boolean.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -23,7 +23,6 @@
#define _BOOLEAN_HPP____OF_AXIS_INCLUDED_
#include "IAnySimpleType.hpp"
-#include <axis/AxisUserAPI.hpp>
AXIS_CPP_NAMESPACE_START
1.6 +5 -5 ws-axis/c/src/soap/xsd/Byte.cpp
Index: Byte.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Byte.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Byte.cpp 18 Feb 2005 11:11:20 -0000 1.5
+++ Byte.cpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -12,7 +12,7 @@
AxisChar* Byte::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((char*) value);
+ return serialize((xsd__byte*) value);
}
void* Byte::deserializer(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -22,21 +22,21 @@
AxisChar* Byte::serialize(const char* value) throw (AxisSoapException)
{
- short valueAsShort = static_cast<short>(*value);
+ xsd__short valueAsShort = static_cast<xsd__short>(*value);
return Short::serialize(&valueAsShort);
}
char* Byte::deserializeByte(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- short* returnValue = Short::deserializeShort(valueAsChar);
+ xsd__short* returnValue = Short::deserializeShort(valueAsChar);
if(m_Byte)
{
delete m_Byte;
m_Byte = NULL;
}
- m_Byte = new char;
- *m_Byte = static_cast<char> (*returnValue);
+ m_Byte = new xsd__byte;
+ *m_Byte = static_cast<xsd__byte> (*returnValue);
return m_Byte;
}
1.5 +3 -3 ws-axis/c/src/soap/xsd/Byte.hpp
Index: Byte.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Byte.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Byte.hpp 24 Jan 2005 17:21:26 -0000 1.4
+++ Byte.hpp 4 Mar 2005 13:51:40 -0000 1.5
@@ -60,14 +60,14 @@
* @param value The Byte value to be serialized.
* @return Serialized form of Byte value.
*/
- AxisChar* serialize(const char* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__byte* value) throw (AxisSoapException);
/**
* Deserialized Byte value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Byte value.
* @return Deserialized Byte value.
*/
- char* deserializeByte(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__byte* deserializeByte(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -100,7 +100,7 @@
virtual MaxExclusive* getMaxExclusive();
private:
- char* m_Byte;
+ xsd__byte* m_Byte;
};
AXIS_CPP_NAMESPACE_END
1.11 +4 -4 ws-axis/c/src/soap/xsd/Date.cpp
Index: Date.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Date.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Date.cpp 2 Mar 2005 09:51:34 -0000 1.10
+++ Date.cpp 4 Mar 2005 13:51:40 -0000 1.11
@@ -8,7 +8,7 @@
AxisChar* Date::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((struct tm*) value);
+ return serialize((xsd__date*) value);
}
void* Date::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeDate(valueAsChar);
}
- AxisChar* Date::serialize(const struct tm* value) throw (AxisSoapException)
+ AxisChar* Date::serialize(const xsd__date* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -157,7 +157,7 @@
return m_Buf;
}
- struct tm* Date::deserializeDate(const AxisChar* valueAsChar) throw (AxisSoapException)
+ xsd__date* Date::deserializeDate(const AxisChar* valueAsChar) throw (AxisSoapException)
{
struct tm value;
struct tm *pTm;
@@ -290,7 +290,7 @@
delete m_Date;
m_Date = NULL;
}
- m_Date = new struct tm;
+ m_Date = new xsd__date;
memcpy (m_Date, pTm, sizeof (tm));
return m_Date;
}
1.7 +3 -3 ws-axis/c/src/soap/xsd/Date.hpp
Index: Date.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Date.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Date.hpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Date.hpp 4 Mar 2005 13:51:40 -0000 1.7
@@ -60,14 +60,14 @@
* @param value The Date value to be serialized.
* @return Serialized form of Date value.
*/
- AxisChar* serialize(const struct tm* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__date* value) throw (AxisSoapException);
/**
* Deserialized Date value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Date value.
* @return Deserialized Date value.
*/
- struct tm* deserializeDate(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__date* deserializeDate(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -106,7 +106,7 @@
WhiteSpace* getWhiteSpace();
private:
- struct tm* m_Date;
+ xsd__date* m_Date;
};
AXIS_CPP_NAMESPACE_END
1.14 +4 -4 ws-axis/c/src/soap/xsd/DateTime.cpp
Index: DateTime.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/DateTime.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DateTime.cpp 2 Mar 2005 09:51:34 -0000 1.13
+++ DateTime.cpp 4 Mar 2005 13:51:40 -0000 1.14
@@ -12,7 +12,7 @@
AxisChar* DateTime::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((struct tm*) value);
+ return serialize((xsd__dateTime*) value);
}
void* DateTime::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -20,7 +20,7 @@
return (void*) deserializeDateTime(valueAsChar);
}
- AxisChar* DateTime::serialize(const struct tm* value) throw (AxisSoapException)
+ AxisChar* DateTime::serialize(const xsd__dateTime* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -161,7 +161,7 @@
return m_Buf;
}
- struct tm* DateTime::deserializeDateTime(const AxisChar* valueAsChar) throw (AxisSoapException)
+ xsd__dateTime* DateTime::deserializeDateTime(const AxisChar* valueAsChar) throw (AxisSoapException)
{
struct tm value;
struct tm* pTm;
@@ -304,7 +304,7 @@
delete m_DateTime;
m_DateTime = NULL;
}
- m_DateTime = new struct tm;
+ m_DateTime = new xsd__dateTime;
memcpy (m_DateTime, pTm, sizeof (tm));
return m_DateTime;
1.8 +3 -3 ws-axis/c/src/soap/xsd/DateTime.hpp
Index: DateTime.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/DateTime.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DateTime.hpp 24 Jan 2005 17:21:26 -0000 1.7
+++ DateTime.hpp 4 Mar 2005 13:51:40 -0000 1.8
@@ -65,14 +65,14 @@
* @param value The DateTime value to be serialized.
* @return Serialized form of DateTime value.
*/
- AxisChar* serialize(const struct tm* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__dateTime* value) throw (AxisSoapException);
/**
* Deserialized DateTime value from it's on-the-wire string form.
* @param valueAsChar Serialized form of DateTime value.
* @return Deserialized Date value.
*/
- struct tm* deserializeDateTime(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__dateTime* deserializeDateTime(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -111,7 +111,7 @@
WhiteSpace* getWhiteSpace();
private:
- struct tm* m_DateTime;
+ xsd__dateTime* m_DateTime;
};
AXIS_CPP_NAMESPACE_END
1.13 +4 -4 ws-axis/c/src/soap/xsd/Decimal.cpp
Index: Decimal.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Decimal.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Decimal.cpp 2 Mar 2005 09:51:34 -0000 1.12
+++ Decimal.cpp 4 Mar 2005 13:51:40 -0000 1.13
@@ -12,7 +12,7 @@
AxisChar* Decimal::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((double*) value);
+ return serialize((xsd__decimal*) value);
}
void* Decimal::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -21,7 +21,7 @@
}
-AxisChar* Decimal::serialize(const double* value) throw (AxisSoapException)
+AxisChar* Decimal::serialize(const xsd__decimal* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -149,7 +149,7 @@
return m_Buf;
}
-double* Decimal::deserializeDecimal(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__decimal* Decimal::deserializeDecimal(const AxisChar* valueAsChar) throw (AxisSoapException)
{
AxisChar* end;
@@ -158,7 +158,7 @@
delete m_Decimal;
m_Decimal = NULL;
}
- m_Decimal = new double;
+ m_Decimal = new xsd__decimal;
*m_Decimal = strtod (valueAsChar, &end);
return m_Decimal;
1.9 +3 -3 ws-axis/c/src/soap/xsd/Decimal.hpp
Index: Decimal.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Decimal.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Decimal.hpp 26 Jan 2005 09:55:54 -0000 1.8
+++ Decimal.hpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -66,14 +66,14 @@
* @param value The Decimal value to be serialized.
* @return Serialized form of Decimal value.
*/
- AxisChar* serialize(const double* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__decimal* value) throw (AxisSoapException);
/**
* Deserialized Decimal value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Decimal value.
* @return Deserialized Decimal value.
*/
- double* deserializeDecimal(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__decimal* deserializeDecimal(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -126,7 +126,7 @@
FractionDigits* getFractionDigits();
private:
- double* m_Decimal;
+ xsd__decimal* m_Decimal;
};
AXIS_CPP_NAMESPACE_END
1.9 +3 -3 ws-axis/c/src/soap/xsd/Double.cpp
Index: Double.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Double.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Double.cpp 2 Mar 2005 09:51:34 -0000 1.8
+++ Double.cpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -17,7 +17,7 @@
}
-AxisChar* Double::serialize(const double* value) throw (AxisSoapException)
+AxisChar* Double::serialize(const xsd__double* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -117,7 +117,7 @@
return m_Buf;
}
-double* Double::deserializeDouble(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__double* Double::deserializeDouble(const AxisChar* valueAsChar) throw (AxisSoapException)
{
AxisChar* end;
@@ -126,7 +126,7 @@
delete m_Double;
m_Double = NULL;
}
- m_Double = new double;
+ m_Double = new xsd__double;
*m_Double = strtod (valueAsChar, &end);
return m_Double;
1.7 +3 -3 ws-axis/c/src/soap/xsd/Double.hpp
Index: Double.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Double.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Double.hpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Double.hpp 4 Mar 2005 13:51:40 -0000 1.7
@@ -59,14 +59,14 @@
* @param value The Double value to be serialized.
* @return Serialized form of Double value.
*/
- AxisChar* serialize(const double* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__double* value) throw (AxisSoapException);
/**
* Deserialized Double value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Double value.
* @return Deserialized Double value.
*/
- double* deserializeDouble(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__double* deserializeDouble(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -105,7 +105,7 @@
WhiteSpace* getWhiteSpace();
private:
- double* m_Double;
+ xsd__double* m_Double;
};
AXIS_CPP_NAMESPACE_END
1.9 +9 -8 ws-axis/c/src/soap/xsd/Duration.cpp
Index: Duration.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Duration.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Duration.cpp 2 Mar 2005 09:51:34 -0000 1.8
+++ Duration.cpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -8,7 +8,7 @@
AxisChar* Duration::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((long*) value);
+ return serialize((xsd__duration*) value);
}
void* Duration::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeDuration(valueAsChar);
}
- AxisChar* Duration::serialize(const long* value) throw (AxisSoapException)
+ AxisChar* Duration::serialize(const xsd__duration* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
@@ -171,7 +171,7 @@
return m_Buf;
}
- long* Duration::deserializeDuration(const AxisChar* valueAsChar) throw (AxisSoapException)
+ xsd__duration* Duration::deserializeDuration(const AxisChar* valueAsChar) throw (AxisSoapException)
{
AxisString valueAsString = valueAsChar;
AxisString buff;
@@ -182,6 +182,7 @@
delete m_Duration;
m_Duration = NULL;
}
+ m_Duration = new xsd__duration;
/*XSD_DURATION is of the format PnYnMnDTnHnMnS */
@@ -196,22 +197,22 @@
intPos2 = valueAsString.find_first_of ("M");
buff = valueAsString.substr (intPos1 + 1, intPos2 - intPos1 - 1);
int months = atoi (buff.c_str ());
- *m_Duration = months * 30 * 24 * 3600;
+ *m_Duration += months * 30 * 24 * 3600;
// Deserialize Days
intPos3 = valueAsString.find_first_of ("D");
buff = valueAsString.substr (intPos2 + 1, intPos3 - intPos2 - 1);
int days = atoi (buff.c_str ());
- *m_Duration = days * 24 * 3600;
-
+ *m_Duration += days * 24 * 3600;
+
// Deserialize Hours
intPos4 = valueAsString.find_first_of ("H");
buff = valueAsString.substr (intPos3 + 2, intPos4 - intPos3 - 2);
int hours = atoi (buff.c_str ());
- *m_Duration = hours * 3600;
+ *m_Duration += hours * 3600;
// Deserialize Minutes
- intPos5 = valueAsString.find_first_of ("M");
+ intPos5 = valueAsString.find_last_of ("M");
buff = valueAsString.substr (intPos4 + 1, intPos5 - intPos4 - 1);
int mins = atoi (buff.c_str ());
*m_Duration += mins * 60;
1.7 +3 -3 ws-axis/c/src/soap/xsd/Duration.hpp
Index: Duration.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Duration.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Duration.hpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Duration.hpp 4 Mar 2005 13:51:40 -0000 1.7
@@ -60,14 +60,14 @@
* @param value The Duration value to be serialized.
* @return Serialized form of Duration value.
*/
- AxisChar* serialize(const long* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__duration* value) throw (AxisSoapException);
/**
* Deserialized Duration value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Duration value.
* @return Deserialized Duration value.
*/
- long* deserializeDuration(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__duration* deserializeDuration(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -108,7 +108,7 @@
private:
- long* m_Duration;
+ xsd__duration* m_Duration;
};
AXIS_CPP_NAMESPACE_END
1.11 +4 -4 ws-axis/c/src/soap/xsd/Float.cpp
Index: Float.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Float.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Float.cpp 2 Mar 2005 09:51:34 -0000 1.10
+++ Float.cpp 4 Mar 2005 13:51:40 -0000 1.11
@@ -12,7 +12,7 @@
AxisChar* Float::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((float*) value);
+ return serialize((xsd__float*) value);
}
void* Float::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -21,7 +21,7 @@
}
-AxisChar* Float::serialize(const float* value) throw (AxisSoapException)
+AxisChar* Float::serialize(const xsd__float* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -120,7 +120,7 @@
return m_Buf;
}
-float* Float::deserializeFloat(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__float* Float::deserializeFloat(const AxisChar* valueAsChar) throw (AxisSoapException)
{
AxisChar* end;
if (m_Float)
@@ -128,7 +128,7 @@
delete m_Float;
m_Float = NULL;
}
- m_Float = new float;
+ m_Float = new xsd__float;
*m_Float = (float) strtod (valueAsChar, &end);
return m_Float;
1.8 +3 -3 ws-axis/c/src/soap/xsd/Float.hpp
Index: Float.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Float.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Float.hpp 24 Jan 2005 17:21:26 -0000 1.7
+++ Float.hpp 4 Mar 2005 13:51:40 -0000 1.8
@@ -65,14 +65,14 @@
* @param value The Float value to be serialized.
* @return Serialized form of Float value.
*/
- AxisChar* serialize(const float* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__float* value) throw (AxisSoapException);
/**
* Deserialized Float value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Float value.
* @return Deserialized Float value.
*/
- float* deserializeFloat(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__float* deserializeFloat(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -111,7 +111,7 @@
WhiteSpace* getWhiteSpace();
private:
- float* m_Float;
+ xsd__float* m_Float;
};
AXIS_CPP_NAMESPACE_END
1.5 +1 -0 ws-axis/c/src/soap/xsd/IAnySimpleType.hpp
Index: IAnySimpleType.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/IAnySimpleType.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IAnySimpleType.hpp 26 Jan 2005 14:16:06 -0000 1.4
+++ IAnySimpleType.hpp 4 Mar 2005 13:51:40 -0000 1.5
@@ -23,6 +23,7 @@
#include <axis/GDefine.hpp>
#include <string>
+#include <axis/AxisUserAPI.hpp>
#include "../AxisSoapException.h"
#include "constraints/WhiteSpace.hpp"
#include "constraints/Pattern.hpp"
1.10 +8 -8 ws-axis/c/src/soap/xsd/Int.cpp
Index: Int.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Int.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Int.cpp 18 Feb 2005 11:11:20 -0000 1.9
+++ Int.cpp 4 Mar 2005 13:51:40 -0000 1.10
@@ -12,31 +12,31 @@
AxisChar* Int::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((int*) value);
+ return serialize((xsd__int*) value);
}
-void* Int::deserializer(const AxisChar* valueAsChar) throw (AxisSoapException)
+void* Int::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
{
return (void*) deserializeInt(valueAsChar);
}
-AxisChar* Int::serialize(const int* value) throw (AxisSoapException)
+AxisChar* Int::serialize(const xsd__int* value) throw (AxisSoapException)
{
- LONGLONG valueAsLong = static_cast<LONGLONG>(*value);
+ xsd__long valueAsLong = static_cast<xsd__long>(*value);
return Long::serialize(&valueAsLong);
}
-int* Int::deserializeInt(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__int* Int::deserializeInt(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- LONGLONG* returnValue = Long::deserializeLong(valueAsChar);
+ xsd__long* returnValue = Long::deserializeLong(valueAsChar);
if(m_Int)
{
delete m_Int;
m_Int = NULL;
}
- m_Int = new int;
- *m_Int = static_cast<int> (*returnValue);
+ m_Int = new xsd__int;
+ *m_Int = static_cast<xsd__int> (*returnValue);
return m_Int;
}
1.8 +4 -4 ws-axis/c/src/soap/xsd/Int.hpp
Index: Int.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Int.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Int.hpp 24 Jan 2005 17:21:26 -0000 1.7
+++ Int.hpp 4 Mar 2005 13:51:40 -0000 1.8
@@ -53,21 +53,21 @@
* @param valueAsChar Serialized form of value.
* @return Deserialized value.
*/
- void* deserializer(const AxisChar* valueAsChar) throw (AxisSoapException);
+ void* deserialize(const AxisChar* valueAsChar) throw (AxisSoapException);
/**
* Serialize Int value to it's on-the-wire string form.
* @param value The Int value to be serialized.
* @return Serialized form of Int value.
*/
- AxisChar* serialize(const int* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__int* value) throw (AxisSoapException);
/**
* Deserialized Int value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Int value.
* @return Deserialized Int value.
*/
- int* deserializeInt(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__int* deserializeInt(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -100,7 +100,7 @@
virtual MaxExclusive* getMaxExclusive();
private:
- int* m_Int;
+ xsd__int* m_Int;
};
AXIS_CPP_NAMESPACE_END
1.10 +4 -4 ws-axis/c/src/soap/xsd/Integer.cpp
Index: Integer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Integer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Integer.cpp 2 Mar 2005 09:51:34 -0000 1.9
+++ Integer.cpp 4 Mar 2005 13:51:40 -0000 1.10
@@ -12,7 +12,7 @@
AxisChar* Integer::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((LONGLONG*) value);
+ return serialize((xsd__integer*) value);
}
void* Integer::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -21,7 +21,7 @@
}
-AxisChar* Integer::serialize(const LONGLONG* value) throw (AxisSoapException)
+AxisChar* Integer::serialize(const xsd__integer* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -135,7 +135,7 @@
return m_Buf;
}
-LONGLONG* Integer::deserializeInteger(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__integer* Integer::deserializeInteger(const AxisChar* valueAsChar) throw (AxisSoapException)
{
AxisChar* end;
@@ -144,7 +144,7 @@
delete m_Integer;
m_Integer = NULL;
}
- m_Integer = new LONGLONG;
+ m_Integer = new xsd__integer;
*m_Integer = strtol (valueAsChar, &end, 10);
return m_Integer;
1.6 +3 -3 ws-axis/c/src/soap/xsd/Integer.hpp
Index: Integer.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Integer.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Integer.hpp 26 Jan 2005 09:55:54 -0000 1.5
+++ Integer.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -61,14 +61,14 @@
* @param value The Integer value to be serialized.
* @return Serialized form of Integer value.
*/
- AxisChar* serialize(const LONGLONG* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__integer* value) throw (AxisSoapException);
/**
* Deserialized Integer value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Integer value.
* @return Deserialized Integer value.
*/
- LONGLONG* deserializeInteger(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__integer* deserializeInteger(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -79,7 +79,7 @@
FractionDigits* getFractionDigits();
private:
- LONGLONG* m_Integer;
+ xsd__integer* m_Integer;
};
AXIS_CPP_NAMESPACE_END
1.6 +36 -2 ws-axis/c/src/soap/xsd/Long.cpp
Index: Long.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Long.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Long.cpp 25 Jan 2005 11:26:38 -0000 1.5
+++ Long.cpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -2,9 +2,43 @@
AXIS_CPP_NAMESPACE_START
-LONGLONG* Long::deserializeLong(const AxisChar* valueAsChar) throw (AxisSoapException)
+Long::Long():m_Long(NULL)
{
- return (LONGLONG*) deserialize(valueAsChar);
+}
+
+Long::~Long()
+{
+}
+
+
+AxisChar* Long::serialize(const void* value) throw (AxisSoapException)
+{
+ return serialize((xsd__long*) value);
+}
+
+void* Long::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
+{
+ return (void*) deserializeLong(valueAsChar);
+}
+
+AxisChar* Long::serialize(const xsd__long* value) throw (AxisSoapException)
+{
+ xsd__integer valueAsLong = static_cast<xsd__integer>(*value);
+ return Integer::serialize(&valueAsLong);
+}
+
+xsd__long* Long::deserializeLong(const AxisChar* valueAsChar) throw (AxisSoapException)
+{
+ xsd__integer* returnValue = Integer::deserializeInteger(valueAsChar);
+
+ if(m_Long)
+ {
+ delete m_Long;
+ m_Long = NULL;
+ }
+ m_Long = new xsd__long;
+ *m_Long = static_cast<xsd__long> (*returnValue);
+ return m_Long;
}
MinInclusive* Long::getMinInclusive()
1.6 +35 -2 ws-axis/c/src/soap/xsd/Long.hpp
Index: Long.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Long.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Long.hpp 25 Jan 2005 11:26:38 -0000 1.5
+++ Long.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -30,13 +30,43 @@
class Long : public Integer {
public:
+ /**
+ * Constructor
+ */
+ Long();
+
+ /**
+ * Destructor
+ */
+ ~Long();
+
+ /**
+ * Serialize value to it's on-the-wire string form.
+ * @param value The value to be serialized.
+ * @return Serialized form of value.
+ */
+ AxisChar* serialize(const void* value) throw (AxisSoapException);
+
+ /**
+ * Deserialize value from it's on-the-wire string form.
+ * @param valueAsChar Serialized form of value.
+ * @return Deserialized value.
+ */
+ void* deserialize(const AxisChar* valueAsChar) throw (AxisSoapException);
+
+ /**
+ * Serialize Long value to it's on-the-wire string form.
+ * @param value The Long value to be serialized.
+ * @return Serialized form of Long value.
+ */
+ AxisChar* serialize(const xsd__long* value) throw (AxisSoapException);
/**
* Deserialized Long value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Long value.
* @return Deserialized Long value.
*/
- LONGLONG* deserializeLong(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__long* deserializeLong(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -52,7 +82,10 @@
* 9223372036854775807.
* @return MaxInclusive object
*/
- virtual MaxInclusive* getMaxInclusive();
+ virtual MaxInclusive* getMaxInclusive();
+
+private:
+ xsd__long* m_Long;
};
AXIS_CPP_NAMESPACE_END
1.9 +3 -3 ws-axis/c/src/soap/xsd/NOTATION.cpp
Index: NOTATION.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/NOTATION.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NOTATION.cpp 2 Mar 2005 09:51:34 -0000 1.8
+++ NOTATION.cpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -8,7 +8,7 @@
AxisChar* NOTATION::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((AxisChar*) value);
+ return serialize((xsd__notation) value);
}
void* NOTATION::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeNOTATION(valueAsChar);
}
-AxisChar* NOTATION::serialize(const AxisChar* value) throw (AxisSoapException)
+AxisChar* NOTATION::serialize(const xsd__notation value) throw (AxisSoapException)
{
MinLength* minLength= getMinLength();
if (minLength->isSet())
@@ -91,7 +91,7 @@
return m_Buf;
}
-AxisChar* NOTATION::deserializeNOTATION(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__notation NOTATION::deserializeNOTATION(const AxisChar* valueAsChar) throw (AxisSoapException)
{
if (m_NOTATION)
{
1.6 +3 -3 ws-axis/c/src/soap/xsd/NOTATION.hpp
Index: NOTATION.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/NOTATION.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NOTATION.hpp 25 Jan 2005 12:04:52 -0000 1.5
+++ NOTATION.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -58,14 +58,14 @@
* @param value The NOTATION value to be serialized.
* @return Serialized form of NOTATION value.
*/
- AxisChar* serialize(const AxisChar* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__notation value) throw (AxisSoapException);
/**
* Deserialized NOTATION value from it's on-the-wire string form.
* @param valueAsChar Serialized form of NOTATION value.
* @return Deserialized NOTATION value.
*/
- AxisChar* deserializeNOTATION(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__notation deserializeNOTATION(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -97,7 +97,7 @@
Length* getLength();
private:
- AxisChar* m_NOTATION;
+ xsd__notation m_NOTATION;
};
AXIS_CPP_NAMESPACE_END
1.6 +7 -7 ws-axis/c/src/soap/xsd/Short.cpp
Index: Short.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Short.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Short.cpp 18 Feb 2005 11:11:20 -0000 1.5
+++ Short.cpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -12,7 +12,7 @@
AxisChar* Short::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((short*) value);
+ return serialize((xsd__short*) value);
}
void* Short::deserializer(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -20,23 +20,23 @@
return (void*) deserializeShort(valueAsChar);
}
-AxisChar* Short::serialize(const short* value) throw (AxisSoapException)
+AxisChar* Short::serialize(const xsd__short* value) throw (AxisSoapException)
{
- int valueAsInt = static_cast<int>(*value);
+ xsd__int valueAsInt = static_cast<xsd__int>(*value);
return Int::serialize(&valueAsInt);
}
-short* Short::deserializeShort(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__short* Short::deserializeShort(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- int* returnValue = Int::deserializeInt(valueAsChar);
+ xsd__int* returnValue = Int::deserializeInt(valueAsChar);
if(m_Short)
{
delete m_Short;
m_Short = NULL;
}
- m_Short = new short;
- *m_Short = static_cast<short> (*returnValue);
+ m_Short = new xsd__short;
+ *m_Short = static_cast<xsd__short> (*returnValue);
return m_Short;
}
1.5 +3 -3 ws-axis/c/src/soap/xsd/Short.hpp
Index: Short.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Short.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Short.hpp 24 Jan 2005 17:21:26 -0000 1.4
+++ Short.hpp 4 Mar 2005 13:51:40 -0000 1.5
@@ -60,14 +60,14 @@
* @param value The Short value to be serialized.
* @return Serialized form of Short value.
*/
- AxisChar* serialize(const short* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__short* value) throw (AxisSoapException);
/**
* Deserialized Short value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Short value.
* @return Deserialized Short value.
*/
- short* deserializeShort(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__short* deserializeShort(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -100,7 +100,7 @@
virtual MaxExclusive* getMaxExclusive();
private:
- short* m_Short;
+ xsd__short* m_Short;
};
AXIS_CPP_NAMESPACE_END
1.9 +3 -3 ws-axis/c/src/soap/xsd/String.cpp
Index: String.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/String.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- String.cpp 2 Mar 2005 09:51:34 -0000 1.8
+++ String.cpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -8,7 +8,7 @@
AxisChar* String::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((AxisChar*) value);
+ return serialize((xsd__string) value);
}
void* String::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeString(valueAsChar);
}
-AxisChar* String::serialize(const AxisChar* value) throw (AxisSoapException)
+AxisChar* String::serialize(const xsd__string value) throw (AxisSoapException)
{
MinLength* minLength= getMinLength();
if (minLength->isSet())
@@ -91,7 +91,7 @@
return m_Buf;
}
-AxisChar* String::deserializeString(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__string String::deserializeString(const AxisChar* valueAsChar) throw (AxisSoapException)
{
if (m_String)
{
1.6 +3 -3 ws-axis/c/src/soap/xsd/String.hpp
Index: String.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/String.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- String.hpp 25 Jan 2005 12:04:52 -0000 1.5
+++ String.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -58,14 +58,14 @@
* @param value The String value to be serialized.
* @return Serialized form of String value.
*/
- AxisChar* serialize(const AxisChar* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__string value) throw (AxisSoapException);
/**
* Deserialized String value from it's on-the-wire string form.
* @param valueAsChar Serialized form of String value.
* @return Deserialized String value.
*/
- AxisChar* deserializeString(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__string deserializeString(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -91,7 +91,7 @@
Length* getLength();
private:
- AxisChar* m_String;
+ xsd__string m_String;
};
AXIS_CPP_NAMESPACE_END
1.11 +4 -4 ws-axis/c/src/soap/xsd/Time.cpp
Index: Time.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Time.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Time.cpp 2 Mar 2005 09:51:35 -0000 1.10
+++ Time.cpp 4 Mar 2005 13:51:40 -0000 1.11
@@ -8,7 +8,7 @@
AxisChar* Time::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((struct tm*) value);
+ return serialize((xsd__time*) value);
}
void* Time::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeTime(valueAsChar);
}
- AxisChar* Time::serialize(const struct tm* value) throw (AxisSoapException)
+ AxisChar* Time::serialize(const xsd__time* value) throw (AxisSoapException)
{
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
@@ -157,7 +157,7 @@
return m_Buf;
}
- struct tm* Time::deserializeTime(const AxisChar* valueAsChar) throw (AxisSoapException)
+ xsd__time* Time::deserializeTime(const AxisChar* valueAsChar) throw (AxisSoapException)
{
struct tm value;
struct tm* pTm;
@@ -294,7 +294,7 @@
m_Time = NULL;
}
- m_Time = new struct tm;
+ m_Time = new xsd__time;
memcpy (m_Time, pTm, sizeof (tm));
return m_Time;
}
1.7 +3 -3 ws-axis/c/src/soap/xsd/Time.hpp
Index: Time.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Time.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Time.hpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Time.hpp 4 Mar 2005 13:51:40 -0000 1.7
@@ -60,14 +60,14 @@
* @param value The Time value to be serialized.
* @return Serialized form of Time value.
*/
- AxisChar* serialize(const struct tm* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__time* value) throw (AxisSoapException);
/**
* Deserialized Time value from it's on-the-wire string form.
* @param valueAsChar Serialized form of Time value.
* @return Deserialized Time value.
*/
- struct tm* deserializeTime(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__time* deserializeTime(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -106,7 +106,7 @@
WhiteSpace* getWhiteSpace();
private:
- struct tm* m_Time;
+ xsd__time* m_Time;
};
AXIS_CPP_NAMESPACE_END
1.3 +7 -7 ws-axis/c/src/soap/xsd/UnsignedByte.cpp
Index: UnsignedByte.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedByte.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnsignedByte.cpp 18 Feb 2005 11:11:20 -0000 1.2
+++ UnsignedByte.cpp 4 Mar 2005 13:51:40 -0000 1.3
@@ -12,7 +12,7 @@
AxisChar* UnsignedByte::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((unsigned char*) value);
+ return serialize((xsd__unsignedByte*) value);
}
void* UnsignedByte::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -20,23 +20,23 @@
return (void*) deserializeUnsignedByte(valueAsChar);
}
-AxisChar* UnsignedByte::serialize(const unsigned char* value) throw (AxisSoapException)
+AxisChar* UnsignedByte::serialize(const xsd__unsignedByte* value) throw (AxisSoapException)
{
- unsigned short valueAsShort = static_cast<unsigned short>(*value);
+ xsd__unsignedShort valueAsShort = static_cast<xsd__unsignedShort>(*value);
return UnsignedShort::serialize(&valueAsShort);
}
-unsigned char* UnsignedByte::deserializeUnsignedByte(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__unsignedByte* UnsignedByte::deserializeUnsignedByte(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- unsigned short* returnValue = UnsignedShort::deserializeUnsignedShort(valueAsChar);
+ xsd__unsignedShort* returnValue = UnsignedShort::deserializeUnsignedShort(valueAsChar);
if(m_UnsignedByte)
{
delete m_UnsignedByte;
m_UnsignedByte = NULL;
}
- m_UnsignedByte = new unsigned char;
- *m_UnsignedByte = static_cast<unsigned char> (*returnValue);
+ m_UnsignedByte = new xsd__unsignedByte;
+ *m_UnsignedByte = static_cast<xsd__unsignedByte> (*returnValue);
return m_UnsignedByte;
}
1.2 +8 -8 ws-axis/c/src/soap/xsd/UnsignedByte.hpp
Index: UnsignedByte.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedByte.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnsignedByte.hpp 25 Jan 2005 14:25:24 -0000 1.1
+++ UnsignedByte.hpp 4 Mar 2005 13:51:40 -0000 1.2
@@ -60,14 +60,14 @@
* @param value The UnsignedByte value to be serialized.
* @return Serialized form of UnsignedByte value.
*/
- AxisChar* serialize(const unsigned char* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__unsignedByte* value) throw (AxisSoapException);
- /**
- * Deserialized UnsignedByte value from it's on-the-wire string form.
- * @param valueAsChar Serialized form of UnsignedByte value.
- * @return Deserialized UnsignedByte value.
- */
- unsigned char* deserializeUnsignedByte(const AxisChar* valueAsChar) throw (AxisSoapException);
+ /**
+ * Deserialized UnsignedByte value from it's on-the-wire string form.
+ * @param valueAsChar Serialized form of UnsignedByte value.
+ * @return Deserialized UnsignedByte value.
+ */
+ xsd__unsignedByte* deserializeUnsignedByte(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -79,7 +79,7 @@
virtual MaxInclusive* getMaxInclusive();
private:
- unsigned char *m_UnsignedByte;
+ xsd__unsignedByte* m_UnsignedByte;
};
AXIS_CPP_NAMESPACE_END
1.5 +7 -7 ws-axis/c/src/soap/xsd/UnsignedInt.cpp
Index: UnsignedInt.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedInt.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnsignedInt.cpp 18 Feb 2005 11:11:20 -0000 1.4
+++ UnsignedInt.cpp 4 Mar 2005 13:51:40 -0000 1.5
@@ -12,7 +12,7 @@
AxisChar* UnsignedInt::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((unsigned int*) value);
+ return serialize((xsd__unsignedInt*) value);
}
void* UnsignedInt::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -20,23 +20,23 @@
return (void*) deserializeUnsignedInt(valueAsChar);
}
-AxisChar* UnsignedInt::serialize(const unsigned int* value) throw (AxisSoapException)
+AxisChar* UnsignedInt::serialize(const xsd__unsignedInt* value) throw (AxisSoapException)
{
- unsigned long valueAsLong = static_cast<unsigned long>(*value);
+ xsd__unsignedLong valueAsLong = static_cast<xsd__unsignedLong>(*value);
return UnsignedLong::serialize(&valueAsLong);
}
-unsigned int* UnsignedInt::deserializeUnsignedInt(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__unsignedInt* UnsignedInt::deserializeUnsignedInt(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- unsigned long* returnValue = UnsignedLong::deserializeUnsignedLong(valueAsChar);
+ xsd__unsignedLong* returnValue = UnsignedLong::deserializeUnsignedLong(valueAsChar);
if(m_UnsignedInt)
{
delete m_UnsignedInt;
m_UnsignedInt = NULL;
}
- m_UnsignedInt = new unsigned int;
- *m_UnsignedInt = static_cast<unsigned int> (*returnValue);
+ m_UnsignedInt = new xsd__unsignedInt;
+ *m_UnsignedInt = static_cast<xsd__unsignedInt> (*returnValue);
return m_UnsignedInt;
}
1.3 +3 -3 ws-axis/c/src/soap/xsd/UnsignedInt.hpp
Index: UnsignedInt.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedInt.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnsignedInt.hpp 25 Jan 2005 14:25:24 -0000 1.2
+++ UnsignedInt.hpp 4 Mar 2005 13:51:40 -0000 1.3
@@ -60,14 +60,14 @@
* @param value The UnsignedInt value to be serialized.
* @return Serialized form of UnsignedInt value.
*/
- AxisChar* serialize(const unsigned int* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__unsignedInt* value) throw (AxisSoapException);
/**
* Deserialized UnsignedInt value from it's on-the-wire string form.
* @param valueAsChar Serialized form of UnsignedInt value.
* @return Deserialized UnsignedInt value.
*/
- unsigned int* deserializeUnsignedInt(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__unsignedInt* deserializeUnsignedInt(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -79,7 +79,7 @@
virtual MaxInclusive* getMaxInclusive();
private:
- unsigned int *m_UnsignedInt;
+ xsd__unsignedInt *m_UnsignedInt;
};
AXIS_CPP_NAMESPACE_END
1.6 +5 -5 ws-axis/c/src/soap/xsd/UnsignedLong.cpp
Index: UnsignedLong.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedLong.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnsignedLong.cpp 18 Feb 2005 11:11:20 -0000 1.5
+++ UnsignedLong.cpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -12,7 +12,7 @@
AxisChar* UnsignedLong::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((unsigned long*) value);
+ return serialize((xsd__unsignedLong*) value);
}
void* UnsignedLong::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -20,13 +20,13 @@
return (void*) deserializeUnsignedLong(valueAsChar);
}
-AxisChar* UnsignedLong::serialize(const unsigned long* value) throw (AxisSoapException)
+AxisChar* UnsignedLong::serialize(const xsd__unsignedLong* value) throw (AxisSoapException)
{
unsigned LONGLONG valueAsLong = static_cast<unsigned LONGLONG>(*value);
return NonNegativeInteger::serialize(&valueAsLong);
}
-unsigned long* UnsignedLong::deserializeUnsignedLong(const AxisChar* valueAsChar) throw (AxisSoapException)
+xsd__unsignedLong* UnsignedLong::deserializeUnsignedLong(const AxisChar* valueAsChar) throw (AxisSoapException)
{
unsigned LONGLONG* returnValue = NonNegativeInteger::deserializeNonNegativeInteger(valueAsChar);
@@ -35,8 +35,8 @@
delete m_UnsignedLong;
m_UnsignedLong = NULL;
}
- m_UnsignedLong = new unsigned long;
- *m_UnsignedLong = static_cast<unsigned long> (*returnValue);
+ m_UnsignedLong = new xsd__unsignedLong;
+ *m_UnsignedLong = static_cast<xsd__unsignedLong> (*returnValue);
return m_UnsignedLong;
}
1.4 +3 -3 ws-axis/c/src/soap/xsd/UnsignedLong.hpp
Index: UnsignedLong.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedLong.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UnsignedLong.hpp 25 Jan 2005 14:25:24 -0000 1.3
+++ UnsignedLong.hpp 4 Mar 2005 13:51:40 -0000 1.4
@@ -60,14 +60,14 @@
* @param value The UnsignedLong value to be serialized.
* @return Serialized form of UnsignedLong value.
*/
- AxisChar* serialize(const unsigned long* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__unsignedLong* value) throw (AxisSoapException);
/**
* Deserialized UnsignedLong value from it's on-the-wire string form.
* @param valueAsChar Serialized form of UnsignedLong value.
* @return Deserialized UnsignedLong value.
*/
- unsigned long* deserializeUnsignedLong(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__unsignedLong* deserializeUnsignedLong(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -79,7 +79,7 @@
virtual MaxInclusive* getMaxInclusive();
private:
- unsigned long *m_UnsignedLong;
+ xsd__unsignedLong *m_UnsignedLong;
};
AXIS_CPP_NAMESPACE_END
1.5 +2 -2 ws-axis/c/src/soap/xsd/UnsignedShort.cpp
Index: UnsignedShort.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedShort.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnsignedShort.cpp 18 Feb 2005 16:38:29 -0000 1.4
+++ UnsignedShort.cpp 4 Mar 2005 13:51:40 -0000 1.5
@@ -22,13 +22,13 @@
AxisChar* UnsignedShort::serialize(xsd__unsignedShort * value) throw (AxisSoapException)
{
- unsigned int valueAsInt = static_cast<unsigned int>(*value);
+ xsd__unsignedInt valueAsInt = static_cast<xsd__unsignedInt>(*value);
return UnsignedInt::serialize(&valueAsInt);
}
xsd__unsignedShort* UnsignedShort::deserializeUnsignedShort(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- unsigned int* returnValue = UnsignedInt::deserializeUnsignedInt(valueAsChar);
+ xsd__unsignedInt* returnValue = UnsignedInt::deserializeUnsignedInt(valueAsChar);
if(m_UnsignedShort)
{
1.9 +3 -3 ws-axis/c/src/soap/xsd/XSD_QName.cpp
Index: XSD_QName.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/XSD_QName.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSD_QName.cpp 2 Mar 2005 09:51:35 -0000 1.8
+++ XSD_QName.cpp 4 Mar 2005 13:51:40 -0000 1.9
@@ -8,7 +8,7 @@
AxisChar* XSD_QName::serialize(const void* value) throw (AxisSoapException)
{
- return serialize((AxisChar*) value);
+ return serialize((xsd__QName) value);
}
void* XSD_QName::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
@@ -16,7 +16,7 @@
return (void*) deserializeQName(valueAsChar);
}
- AxisChar* XSD_QName::serialize(const AxisChar* value) throw (AxisSoapException)
+ AxisChar* XSD_QName::serialize(const xsd__QName value) throw (AxisSoapException)
{
MinLength* minLength= getMinLength();
if (minLength->isSet())
@@ -91,7 +91,7 @@
return m_Buf;
}
- AxisChar* XSD_QName::deserializeQName(const AxisChar* valueAsChar) throw (AxisSoapException)
+ xsd__QName XSD_QName::deserializeQName(const AxisChar* valueAsChar) throw (AxisSoapException)
{
m_QName = new char[strlen (valueAsChar) + 1];
strcpy (m_QName, valueAsChar);
1.6 +3 -3 ws-axis/c/src/soap/xsd/XSD_QName.hpp
Index: XSD_QName.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/XSD_QName.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSD_QName.hpp 25 Jan 2005 12:04:52 -0000 1.5
+++ XSD_QName.hpp 4 Mar 2005 13:51:40 -0000 1.6
@@ -58,14 +58,14 @@
* @param value The QName to be serialized.
* @return Serialized form of QName.
*/
- AxisChar* serialize(const AxisChar* value) throw (AxisSoapException);
+ AxisChar* serialize(const xsd__QName value) throw (AxisSoapException);
/**
* Deserialize QName from it's on-the-wire string form.
* @param valueAsChar Serialized form of QName.
* @return Deserialized QName.
*/
- AxisChar* deserializeQName(const AxisChar* valueAsChar) throw (AxisSoapException);
+ xsd__QName deserializeQName(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -97,7 +97,7 @@
Length* getLength();
private:
- AxisChar* m_QName;
+ xsd__QName m_QName;
};
1.4 +5 -2 ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp
Index: XSDElementClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSDElementClient.cpp 23 Feb 2005 11:33:49 -0000 1.3
+++ XSDElementClient.cpp 4 Mar 2005 13:51:41 -0000 1.4
@@ -62,7 +62,7 @@
xsd__date dateResult; // typedef of struct tm
xsd__dateTime dateTimeResult; // typedef of struct tm
xsd__time timeResult; // typedef of struct tm
- //xsd__duration no implemented yet
+ xsd__duration durationResult = (xsd__duration) 0;
xsd__string strResult=(xsd__string)0;
xsd__integer intResult=(xsd__integer)0;
xsd__decimal decResult=(xsd__decimal)0;
@@ -113,7 +113,7 @@
printf("unsigned int=%d\n", uiResult);
lResult = ws->setGetDataLong((xsd__long)35);
- printf("long=%d\n", lResult);
+ cout << "long=" << lResult << endl;
ulResult = ws->setGetDataUnsignedLong((xsd__unsignedLong)42);
printf("unsigned long=%d\n", ulResult);
@@ -123,6 +123,9 @@
dResult = ws->setGetDataDouble((xsd__double)70.7175888888);
printf("double=%.5f\n", dResult); fflush(stdout);
+ durationResult = ws->setGetDataDurationType((xsd__duration)123456789);
+ cout << "duration=" << durationResult << endl;
+
dateResult = ws->setGetDateType(testDate);
strftime(dateTime, 50, "%a %b %d %Y", &dateResult);
cout << "date=" << dateTime << endl;
1.4 +7 -4 ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp
Index: XSDElementNilClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSDElementNilClient.cpp 23 Feb 2005 11:33:49 -0000 1.3
+++ XSDElementNilClient.cpp 4 Mar 2005 13:51:42 -0000 1.4
@@ -62,7 +62,7 @@
xsd__date* dateResult; // typedef of struct tm
xsd__dateTime* dateTimeResult; // typedef of struct tm
xsd__time* timeResult; // typedef of struct tm
- //xsd__duration no implemented yet
+ xsd__duration* durationResult;
xsd__string strResult;
xsd__integer* intResult;
xsd__decimal* decResult;
@@ -83,8 +83,8 @@
xsd__date dateInput; // typedef of struct tm
xsd__dateTime dateTimeInput; // typedef of struct tm
xsd__time timeInput; // typedef of struct tm
- //xsd__duration no implemented yet
- xsd__string strInput=(xsd__string)"never odd or even";
+ xsd__duration durationInput = (xsd__duration) 123456789;
+ xsd__string strInput=(xsd__string)"never odd or even";
xsd__integer intInput=(xsd__integer)919191919;
xsd__decimal decInput=(xsd__decimal)929292929.5555555555555;
xsd__base64Binary b64Input;
@@ -137,7 +137,7 @@
printf("unsigned int=%d\n", *uiResult);
lResult = ws->setGetDataLong(&lInput);
- printf("long=%d\n", *lResult);
+ cout << "long=" << *lResult << endl;
ulResult = ws->setGetDataUnsignedLong(&ulInput);
printf("unsigned long=%d\n", *ulResult);
@@ -147,6 +147,9 @@
dResult = ws->setGetDataDouble(&dInput);
printf("double=%.5f\n", *dResult); fflush(stdout);
+ durationResult = ws->setGetDataDurationType(&durationInput);
+ cout << "duration=" << *durationResult << endl;
+
dateResult = ws->setGetDateType(&testDate);
strftime(dateTime, 50, "%a %b %d %Y", dateResult);
cout << "date=" << dateTime << endl;
1.4 +1 -0 ws-axis/c/tests/auto_build/testcases/output/XSDElement.expected
Index: XSDElement.expected
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/XSDElement.expected,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSDElement.expected 23 Feb 2005 11:33:49 -0000 1.3
+++ XSDElement.expected 4 Mar 2005 13:51:42 -0000 1.4
@@ -9,6 +9,7 @@
unsigned long=42
float=35.35359
double=70.71759
+duration=123456789
date=Fri Nov 12 2004
dateTime=Fri Nov 12 07:58:43 2004
string=never odd or even