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 2005/01/07 17:35:20 UTC
cvs commit: ws-axis/c/tools/org/apache/axis/tools/trace tracetool.conf
whitlock 2005/01/07 08:35:20
Modified: c/include/axis IWrapperSoapDeSerializer.hpp
c/include/axis/client Call.hpp
c/src/engine/client Call.cpp
c/tools/org/apache/axis/tools/cbindings
cbindinggenerator.conf
c/tools/org/apache/axis/tools/trace tracetool.conf
Added: c/include/axis AxisUserAPI.h GDefine.h
Log:
Fix build break in Call.hpp and get the C binding generator to run successfully
Revision Changes Path
1.2 +1 -6 ws-axis/c/include/axis/IWrapperSoapDeSerializer.hpp
Index: IWrapperSoapDeSerializer.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IWrapperSoapDeSerializer.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IWrapperSoapDeSerializer.hpp 23 Nov 2004 11:11:11 -0000 1.1
+++ IWrapperSoapDeSerializer.hpp 7 Jan 2005 16:35:20 -0000 1.2
@@ -70,13 +70,8 @@
const AxisChar* pNamespace)=0;
virtual unsigned char AXISCALL getElementAsUnsignedByte(const AxisChar*
pName, const AxisChar* pNamespace)=0;
-#ifdef WIN32
- virtual __int64 AXISCALL getElementAsLong(const AxisChar* pName,
+ virtual xsd__long AXISCALL getElementAsLong(const AxisChar* pName,
const AxisChar* pNamespace)=0;
-#else
- virtual long long AXISCALL getElementAsLong(const AxisChar* pName,
- const AxisChar* pNamespace)=0;
-#endif
virtual long AXISCALL getElementAsInteger(const AxisChar* pName,
const AxisChar* pNamespace)=0;
virtual unsigned long AXISCALL getElementAsUnsignedLong(const AxisChar*
1.1 ws-axis/c/include/axis/AxisUserAPI.h
Index: AxisUserAPI.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(_AXISUSERAPI_H_OF_AXIS_INCLUDED_)
#define _AXISUSERAPI_H_OF_AXIS_INCLUDED_
#include <axis/GDefine.h>
#include <time.h>
#include <string.h>
/**
* @file AxisUserAPI.h
* This file contains types defined in Axis C++. The mapping of basic xsd types
* to the C language types.
*/
/**
* @typedef xsd__string
* Axis C++ defined type for xml basic type string
*/
typedef AxiscChar * xsd__string;
/**
* @typedef xsd__integer
* Axis C++ defined type for xml basic type integer
*/
typedef int xsd__integer;
/**
* @typedef xsd__int
* Axis C++ defined type for xml basic type int
*/
typedef int xsd__int;
/**
* @typedef xsd__long
* Axis C++ defined type for xml basic type long
*/
#ifdef WIN32
typedef __int64 xsd__long;
#else
typedef long long xsd__long;
#endif
/**
* @typedef xsd__short
* Axis C++ defined type for xml basic type short
*/
typedef short xsd__short;
/**
* @typedef xsd__decimal
* Axis C++ defined type for xml basic type decimal
*/
typedef double xsd__decimal;
/**
* @typedef xsd__float
* Axis C++ defined type for xml basic type float
*/
typedef float xsd__float;
/**
* @typedef xsd__double
* Axis C++ defined type for xml basic type double
*/
typedef double xsd__double;
/**
* @typedef xsd__boolean
* Axis C++ defined type for xml basic type boolean
*/
typedef enum { false_=0, true_ } xsd__boolean;
/**
* @typedef xsd__byte
* Axis C++ defined type for xml basic type byte
*/
typedef signed char xsd__byte;
/**
* @typedef xsd__QName
* Axis C++ defined type for xml basic type QName
*/
typedef AxiscChar * xsd__QName;
/**
* @typedef xsd__NCName
* Axis C++ defined type for xml basic type NCName
*/
typedef AxiscChar * xsd__NCName;
/**
* @typedef xsd__dateTime
* Axis C++ defined type for xml basic type dateTime
*/
typedef struct tm xsd__dateTime;
/**
* @typedef xsd__date
* Axis C++ defined type for xml basic type date
*/
typedef struct tm xsd__date;
/**
* @typedef xsd__time
* Axis C++ defined type for xml basic type time
*/
typedef struct tm xsd__time;
/**
* @typedef xsd__unsignedByte
* Axis C++ defined type for xml basic type unsignedByte
*/
typedef unsigned char xsd__unsignedByte;
/**
* @typedef xsd__unsignedInt
* Axis C++ defined type for xml basic type unsignedInt
*/
typedef unsigned int xsd__unsignedInt;
/**
* @typedef xsd__unsignedLong
* Axis C++ defined type for xml basic type unsignedLong
*/
typedef unsigned long xsd__unsignedLong;
/**
* @typedef xsd__unsignedShort
* Axis C++ defined type for xml basic type unsignedShort
*/
typedef unsigned short xsd__unsignedShort;
/**
* @struct xsd__base64Binary
* Axis C++ defined type for xml basic type base64Binary
*/
typedef struct {
xsd__unsignedByte * __ptr;
xsd__int __size;
} xsd__base64Binary;
/**
* @struct xsd__hexBinary
* Axis C++ defined type for xml basic type hexBinary
*/
typedef struct {
xsd__unsignedByte * __ptr;
xsd__int __size;
} xsd__hexBinary;
/**
* @typedef xsd__anyURI
* Axis C++ defined type for xml basic type anyURI
*/
typedef AxiscChar * xsd__anyURI;
/**
* @typedef xsd__NMTOKEN
* Axis C++ defined type for xml basic type anyURI
*/
typedef AxiscChar * xsd__NMTOKEN;
/**
* @enum AXISC_BINDING_STYLE
* Enumeration for the different wsdl styles. This is used by the Axis
* engine to identify the web service or client style.
*/
typedef enum {
AXISC_RPC_ENCODED, /*default*/
AXISC_DOC_LITERAL,
AXISC_RPC_LITERAL
} AXISC_BINDING_STYLE;
#define AXISC_DEFINED_ARRAY(type) \
typedef struct {\
type * m_Array;\
int m_Size;\
} type##_Array;
#define AXISC_DEFINED_ARRAY2(type) \
typedef struct {\
AXISCHANDLE m_Array;\
int m_Size;\
} type##_Array;
typedef struct {
void* m_Array;
int m_Size;
} Axisc_Array;
AXISC_DEFINED_ARRAY(xsd__string)
AXISC_DEFINED_ARRAY(xsd__integer)
AXISC_DEFINED_ARRAY(xsd__int)
AXISC_DEFINED_ARRAY(xsd__long)
AXISC_DEFINED_ARRAY(xsd__short)
AXISC_DEFINED_ARRAY(xsd__decimal)
AXISC_DEFINED_ARRAY(xsd__float)
AXISC_DEFINED_ARRAY(xsd__double)
AXISC_DEFINED_ARRAY(xsd__boolean)
AXISC_DEFINED_ARRAY(xsd__QName)
AXISC_DEFINED_ARRAY(xsd__NCName)
AXISC_DEFINED_ARRAY(xsd__dateTime)
AXISC_DEFINED_ARRAY(xsd__unsignedByte)
AXISC_DEFINED_ARRAY(xsd__unsignedInt)
AXISC_DEFINED_ARRAY(xsd__unsignedLong)
AXISC_DEFINED_ARRAY(xsd__unsignedShort)
AXISC_DEFINED_ARRAY2(xsd__base64Binary)
AXISC_DEFINED_ARRAY2(xsd__hexBinary)
AXISC_DEFINED_ARRAY(xsd__anyURI)
AXISC_DEFINED_ARRAY(xsd__NMTOKEN)
static const int xsd_boolean_true = 1;
static const int xsd_boolean_false = 0;
typedef enum {
AXISC_NORMAL_CHANNEL=0,
AXISC_SSL_CHANNEL
} AXISC_CHANNEL_TYPE;
/**
* @typedef XML_String
* Axis C++ defined type for xml encoded string. This is used only in AnyType.
*/
typedef char* XML_String;
/**
* @struct AxiscAnyType
* Axis C++ defined type for handling xsd:any.
*/
typedef struct
{
/**
* @var _array Contains an array of xml encoded strings.
*/
XML_String* _array;
/**
* @var _size Contains how many xml strings are there in _array
*/
int _size;
} AxiscAnyType;
#endif
1.1 ws-axis/c/include/axis/GDefine.h
Index: GDefine.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#if !defined(__GDEFINE_H_OF_AXIS_INCLUDED__)
#define __GDEFINE_H_OF_AXIS_INCLUDED__
/*
* This file contains all global definitions that are valid across whole
* Axis C++ project.
*/
typedef enum {AXISC_SECURE, AXISC_UNSECURE} AXISC_SECURE_PROTOCOL;
typedef enum
{
AXISC_SUCCESS=0,
AXISC_FAIL = -1,
AXISC_OBJECT_ALREADY_EXISTS=1,
AXISC_NO_SUCH_HANDLER,
AXISC_NO_SUCH_SERVICE
} AXISC_GLOBAL_ERROR;
typedef enum
{
AXISC_PT_UNKNOWN = -1,
AXISC_PTHTTP1_0=0,
AXISC_PTHTTP1_1,
AXISC_PTFTP,
AXISC_PTSMTP,
AXISC_PTHTTPS,
AXISC_PTOTHER
} AXISC_PROTOCOL_TYPE;
typedef enum
{
AXISC_SOAPACTION_HEADER,
AXISC_SERVICE_URI,
AXISC_OPERATION_NAME,
AXISC_SOAP_MESSAGE_LENGTH,
AXISC_TRANSPORT_PROPERTIES,
AXISC_SECURE_PROPERTIES,
AXISC_DLL_NAME,
AXISC_CHANNEL_HTTP_SSL_DLL_NAME = AXISC_DLL_NAME,
AXISC_CHANNEL_HTTP_DLL_NAME
} AXISC_TRANSPORT_INFORMATION_TYPE;
#define AXISC_SOAPACTIONHEADER "SOAPAction"
#define AxiscChar char
#define AxiscXMLCh char
#if defined(WIN32)
#define AXISC_STORAGE_CLASS_INFO __declspec(dllexport)
#else
#define AXISC_STORAGE_CLASS_INFO
#endif
#if defined(__GNUC__)
#define AXISCCALL __attribute__((cdecl))
#else /* unix or win32 */
#if defined(__unix)
#define AXISCCALL
#else
#define AXISCCALL __stdcall
#endif
#endif
typedef int bool;
typedef void* AXISCHANDLE;
#endif
1.16 +2 -12 ws-axis/c/include/axis/client/Call.hpp
Index: Call.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/client/Call.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Call.hpp 7 Jan 2005 11:56:20 -0000 1.15
+++ Call.hpp 7 Jan 2005 16:35:20 -0000 1.16
@@ -111,13 +111,8 @@
const AxisChar* pNamespace)=0;
virtual unsigned char AXISCALL getElementAsUnsignedByte(const AxisChar*
pName, const AxisChar* pNamespace)=0;
-#ifdef WIN32
- virtual __int64 AXISCALL getElementAsLong(const AxisChar* pName,
+ virtual xsd__long AXISCALL getElementAsLong(const AxisChar* pName,
const AxisChar* pNamespace)=0;
-#else
- virtual long long AXISCALL getElementAsLong(const AxisChar* pName,
- const AxisChar* pNamespace)=0;
-#endif
virtual long AXISCALL getElementAsInteger(const AxisChar* pName,
const AxisChar* pNamespace)=0;
virtual unsigned long AXISCALL getElementAsUnsignedLong(const AxisChar*
@@ -287,13 +282,8 @@
const AxisChar* pNamespace);
unsigned char AXISCALL getElementAsUnsignedByte(const AxisChar* pName,
const AxisChar* pNamespace);
-#ifdef WIN32
- __int64 AXISCALL getElementAsLong(const AxisChar* pName,
- const AxisChar* pNamespace);
-#else
- long long AXISCALL getElementAsLong(const AxisChar* pName,
+ xsd__long AXISCALL getElementAsLong(const AxisChar* pName,
const AxisChar* pNamespace);
-#endif
long AXISCALL getElementAsInteger(const AxisChar* pName,
const AxisChar* pNamespace);
unsigned long AXISCALL getElementAsUnsignedLong(const AxisChar* pName,
1.87 +3 -3 ws-axis/c/src/engine/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Call.cpp 7 Jan 2005 15:40:26 -0000 1.86
+++ Call.cpp 7 Jan 2005 16:35:20 -0000 1.87
@@ -147,7 +147,7 @@
int len;
};
-int Call::initialize(PROVIDERTYPE nStyle, int secure)
+int Call::initialize(PROVIDERTYPE nStyle)
/* Does this mean that the stub that uses this Call object as well as all
* client side handlers have the same PROVIDERTYPE ?
*/
@@ -159,7 +159,7 @@
{
m_nStatus = AXIS_SUCCESS;
// remove_headers(&m_Soap);
- if (AXIS_SUCCESS != openConnection ( secure)) {
+ if (AXIS_SUCCESS != openConnection ()) {
m_nStatus = AXIS_FAIL;
return AXIS_FAIL;
}
@@ -323,7 +323,7 @@
* functions with those streams at any time it wants to send/receive
* bytes to/from the server.
*/
-int Call::openConnection(int secure)
+int Call::openConnection()
{
try
{
1.3 +2 -0 ws-axis/c/tools/org/apache/axis/tools/cbindings/cbindinggenerator.conf
Index: cbindinggenerator.conf
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/cbindings/cbindinggenerator.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cbindinggenerator.conf 6 Jan 2005 16:21:28 -0000 1.2
+++ cbindinggenerator.conf 7 Jan 2005 16:35:20 -0000 1.3
@@ -32,5 +32,7 @@
excludemethod=BasicNode::serialize
excludemethod=Call::getTransport
excludemethod=Call::getSOAPSerializer
+excludemethod=IMessageData::setService
+excludemethod=IMessageData::getService
1.2 +2 -0 ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf
Index: tracetool.conf
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracetool.conf 17 Dec 2004 11:49:48 -0000 1.1
+++ tracetool.conf 7 Jan 2005 16:35:20 -0000 1.2
@@ -42,6 +42,8 @@
excludefile=apr_base64.h
excludefile=apr_xlate.h
excludefile=Channel.h
+excludefile=HTTPChannel.hpp
+excludefile=HTTPSSLChannel.hpp
excludefile=Axis.cpp
excludefile=spp.c
excludefile=SecureChannel.hpp