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 da...@apache.org on 2004/01/28 13:11:12 UTC
cvs commit: ws-axis/c/src/server/samples/interoptests/cbase Makefile.am autogen.sh configure.ac runconfig SOAPStruct.c
damitha 2004/01/28 04:11:11
Modified: c/include/axis/common AxisUserAPI.h IMessageData.h
IWrapperSoapDeSerializer.h IWrapperSoapSerializer.h
TypeMapping.h
c/src/client/samples/interoptests/base
InteropTestPortType.cpp Makefile.am
c/src/client/samples/interoptests/cbase InteropBaseClient.c
InteropTestPortType.c
c/src/server/samples/interoptests/cbase SOAPStruct.c
Added: c/samples/server/cservicewrapper Makefile.am autogen.sh
configure.ac runconfig
c/src/client/samples/interoptests/cbase Makefile.am
autogen.sh configure.ac runconfig
c/src/server/samples/interoptests/cbase Makefile.am
autogen.sh configure.ac runconfig
Log:
Added necessary build fils and modified slightly to get the code susantha
commited to get work the interopbase tests for generated c based stubs
Revision Changes Path
1.5 +1 -1 ws-axis/c/include/axis/common/AxisUserAPI.h
Index: AxisUserAPI.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/AxisUserAPI.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisUserAPI.h 17 Jan 2004 12:25:31 -0000 1.4
+++ AxisUserAPI.h 28 Jan 2004 12:10:42 -0000 1.5
@@ -95,7 +95,7 @@
typedef AxisChar * xsd__anyURI;
typedef enum {
- RPC_ENCODED, //default
+ RPC_ENCODED, /*default*/
DOC_LITERAL,
RPC_LITERAL
} AXIS_BINDING_STYLE;
1.6 +2 -3 ws-axis/c/include/axis/common/IMessageData.h
Index: IMessageData.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/IMessageData.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IMessageData.h 19 Jan 2004 07:44:12 -0000 1.5
+++ IMessageData.h 28 Jan 2004 12:10:44 -0000 1.6
@@ -56,9 +56,8 @@
*
*
*/
-// IMessageData.h:
-//
-//////////////////////////////////////////////////////////////////////
+/* IMessageData.h:*/
+
#if !defined(AFX_IMESSAGEDATA_H__EEFDCDB4_6ABA_48CA_8B45_B4FDA6045822__INCLUDED_)
1.8 +2 -3 ws-axis/c/include/axis/common/IWrapperSoapDeSerializer.h
Index: IWrapperSoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/IWrapperSoapDeSerializer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IWrapperSoapDeSerializer.h 28 Jan 2004 10:23:11 -0000 1.7
+++ IWrapperSoapDeSerializer.h 28 Jan 2004 12:10:45 -0000 1.8
@@ -56,9 +56,8 @@
*
*/
-// IWrapperSoapDeSerializer.h:
-//
-//////////////////////////////////////////////////////////////////////
+/* IWrapperSoapDeSerializer.h:*/
+
#if !defined(AFX_IWRAPPERSOAPDESERIALIZER_H__A6C89D23_4098_4A73_BFD7_D8F115AD9BA0__INCLUDED_)
#define AFX_IWRAPPERSOAPDESERIALIZER_H__A6C89D23_4098_4A73_BFD7_D8F115AD9BA0__INCLUDED_
1.7 +2 -3 ws-axis/c/include/axis/common/IWrapperSoapSerializer.h
Index: IWrapperSoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/IWrapperSoapSerializer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IWrapperSoapSerializer.h 28 Jan 2004 10:23:11 -0000 1.6
+++ IWrapperSoapSerializer.h 28 Jan 2004 12:10:46 -0000 1.7
@@ -57,9 +57,8 @@
*
*/
-// IWrapperSoapSerializer.h:
-//
-//////////////////////////////////////////////////////////////////////
+/* IWrapperSoapSerializer.h:*/
+
#if !defined(AFX_IWRAPPERSOAPSERIALIZER_H__D3E794EC_8A67_4E0E_BE28_583DCDCE1C42__INCLUDED_)
#define AFX_IWRAPPERSOAPSERIALIZER_H__D3E794EC_8A67_4E0E_BE28_583DCDCE1C42__INCLUDED_
1.4 +2 -3 ws-axis/c/include/axis/common/TypeMapping.h
Index: TypeMapping.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/TypeMapping.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeMapping.h 14 Jan 2004 12:57:09 -0000 1.3
+++ TypeMapping.h 28 Jan 2004 12:10:46 -0000 1.4
@@ -56,9 +56,8 @@
*
*
*/
-// TypeMapping.h:
-//
-//////////////////////////////////////////////////////////////////////
+/* TypeMapping.h:*/
+
#ifdef WIN32
#pragma warning (disable : 4786)
1.2 +6 -0 ws-axis/c/samples/server/cservicewrapper/Makefile.am
1.2 +48 -0 ws-axis/c/samples/server/cservicewrapper/autogen.sh
1.2 +9 -0 ws-axis/c/samples/server/cservicewrapper/configure.ac
1.2 +2 -0 ws-axis/c/samples/server/cservicewrapper/runconfig
1.13 +1 -1 ws-axis/c/src/client/samples/interoptests/base/InteropTestPortType.cpp
Index: InteropTestPortType.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/InteropTestPortType.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InteropTestPortType.cpp 14 Jan 2004 05:57:22 -0000 1.12
+++ InteropTestPortType.cpp 28 Jan 2004 12:10:56 -0000 1.13
@@ -18,7 +18,7 @@
{
m_pCall = new Call();
m_pCall->SetProtocol(APTHTTP);
- m_pCall->SetEndpointURI("http://localhost/axis/InteropBase");
+ m_pCall->SetEndpointURI("http://localhost:80/axis/InteropBase");
}
InteropTestPortType::~InteropTestPortType()
1.4 +1 -1 ws-axis/c/src/client/samples/interoptests/base/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 12 Jan 2004 12:20:51 -0000 1.3
+++ Makefile.am 28 Jan 2004 12:10:56 -0000 1.4
@@ -3,5 +3,5 @@
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
interopbase_SOURCES = InteropBaseClient.cpp InteropTestPortType.cpp SOAPStruct.cpp
-interopbase_LDADD = $(AXISCPP_HOME)/lib/axis/libaxiscpp_client.a $(AXISCPP_HOME)/bin/libaxiscpp_mod.a -L$(AXISCPP_HOME)/lib/expat -lexpat -ldl
+interopbase_LDADD = $(AXISCPP_HOME)/lib/axis/libaxiscpp_client.a $(AXISCPP_HOME)/bin/libaxiscpp_mod.a -L$(AXISCPP_HOME)/lib/expat -lexpat -ldl -lssl
INCLUDES = -I$(AXISCPP_HOME)/include
1.2 +26 -20 ws-axis/c/src/client/samples/interoptests/cbase/InteropBaseClient.c
Index: InteropBaseClient.c
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/cbase/InteropBaseClient.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InteropBaseClient.c 28 Jan 2004 10:15:51 -0000 1.1
+++ InteropBaseClient.c 28 Jan 2004 12:11:00 -0000 1.2
@@ -1,5 +1,5 @@
-// InteropBaseClient.cpp : Defines the entry point for the console application.
-//
+/* InteropBaseClient.cpp : Defines the entry point for the console application.*/
+
#include "InteropTestPortType.h"
#include <stdio.h>
@@ -19,12 +19,12 @@
time_t tim;
struct tm* lt;
printf("invoking echoString...\n");
- //testing echoString
+ /*testing echoString */
if (0 == strcmp(echoString("hello world"), "hello world"))
printf("successful\n");
else
printf("failed\n");
- // testing echoStringArray
+ /* testing echoStringArray */
arrstr.m_Array = malloc(sizeof(char*)*ARRAYSIZE);
arrstr.m_Size = ARRAYSIZE;
for(x=0; x< ARRAYSIZE; x++)
@@ -32,19 +32,19 @@
sprintf(buffer1, "%dth element of string array", 0);
arrstr.m_Array[x] = strdup(buffer1);
}
- //arrstr.m_Array[1] = buffer2;
+ /*arrstr.m_Array[1] = buffer2;*/
printf("invoking echoStringArray...\n");
if (echoStringArray(arrstr).m_Array != NULL)
printf("successful\n");
else
printf("failed\n");
- // testing echoInteger
+ /* testing echoInteger */
printf("invoking echoInteger...\n");
if (echoInteger(56) == 56)
printf("successful\n");
else
printf("failed\n");
- // testing echoIntegerArray
+ /* testing echoIntegerArray */
arrint.m_Array = malloc(sizeof(int)*ARRAYSIZE);
arrint.m_Size = ARRAYSIZE;
for (x=0;x<ARRAYSIZE;x++)
@@ -56,13 +56,13 @@
printf("successful\n");
else
printf("failed\n");
- // testing echoFloat
+ /* testing echoFloat */
printf("invoking echoFloat...\n");
if (echoFloat(1.4214) > 1.42)
printf("successful\n");
else
printf("failed\n");
- // testing echoFloat
+ /* testing echoFloat */
arrfloat.m_Array = malloc(sizeof(float)*ARRAYSIZE);
arrfloat.m_Size = ARRAYSIZE;
for (x=0;x<ARRAYSIZE;x++)
@@ -74,7 +74,7 @@
printf("successful\n");
else
printf("failed\n");
- // testing echo Struct
+ /* testing echo Struct*/
stct.varFloat = 12345.7346345;
stct.varInt = 5000;
stct.varString = strdup("This is string in SOAPStruct");
@@ -83,8 +83,8 @@
printf("successful\n");
else
printf("failed\n");
- //testing echo Array of Struct
- arrstct.m_Array = malloc(sizeof(SOAPStruct)*ARRAYSIZE);
+ /*testing echo Array of Struct*/
+/* arrstct.m_Array = malloc(sizeof(SOAPStruct)*ARRAYSIZE);
arrstct.m_Size = ARRAYSIZE;
for (x=0;x<ARRAYSIZE;x++)
{
@@ -93,17 +93,21 @@
sprintf(buffer1, "varString of %dth element of SOAPStruct array", x);
arrstct.m_Array[x].varString = buffer1;
}
- //testing echo Struct Array
- printf("invoking echoStructArray...\n");
+*/
+ /*testing echo Struct Array*/
+/* printf("invoking echoStructArray...\n");
if (echoStructArray(arrstct).m_Array != NULL)
printf("successful\n");
else
printf("failed\n");
- //testing echo void
+*/
+ /*testing echo void*/
+/*
printf("invoking echoVoid...\n");
echoVoid();
printf("successful\n");
- //testing echo base 64 binary
+*/
+ /*testing echo base 64 binary*/
/* printf("invoking echoBase64...\n");
if (0 == strcmp(ws.echoBase64("BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG"),
"BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG"))
@@ -124,14 +128,15 @@
printf("successful\n");
else
printf("failed\n");
-*/ //testing echo decimal
- printf("invoking echoDecimal...\n");
+*/ /*testing echo decimal*/
+/* printf("invoking echoDecimal...\n");
if (echoDecimal(1234.567890) > 1234.56)
printf("successful\n");
else
printf("failed\n");
- //testing echo boolean
- printf("invoking echoBoolean...\n");
+*/
+ /*testing echo boolean*/
+/* printf("invoking echoBoolean...\n");
if (echoBoolean(true_) == true_)
printf("successful\n");
else
@@ -139,4 +144,5 @@
getchar();
return 0;
+*/
}
1.3 +1 -1 ws-axis/c/src/client/samples/interoptests/cbase/InteropTestPortType.c
Index: InteropTestPortType.c
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/cbase/InteropTestPortType.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropTestPortType.c 28 Jan 2004 10:15:51 -0000 1.2
+++ InteropTestPortType.c 28 Jan 2004 12:11:01 -0000 1.3
@@ -23,7 +23,7 @@
int nStatus;
CallFunctions* pCall;
xsd__string Ret;
- if (!g_pInteropTestPortType) g_pInteropTestPortType = GetCallObject(APTHTTP, "http://localhost:5555/axis/InteropBase");
+ if (!g_pInteropTestPortType) g_pInteropTestPortType = GetCallObject(APTHTTP, "http://localhost/axis/InteropBase");
if (!g_pInteropTestPortType || !g_pInteropTestPortType->__vfptr) return Ret;
pCall = g_pInteropTestPortType->__vfptr;
/* Following will establish the connections with the server too */
1.1 ws-axis/c/src/client/samples/interoptests/cbase/Makefile.am
Index: Makefile.am
===================================================================
bin_PROGRAMS = interopbase
SUBDIRS =
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
interopbase_SOURCES = InteropBaseClient.c InteropTestPortType.c SOAPStruct.c
interopbase_LDADD = $(AXISCPP_HOME)/lib/axis/libaxiscpp_client.a $(AXISCPP_HOME)/bin/libaxiscpp_mod.a -L$(AXISCPP_HOME)/lib/expat -lexpat -ldl -lssl -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
1.1 ws-axis/c/src/client/samples/interoptests/cbase/autogen.sh
Index: autogen.sh
===================================================================
#! /bin/sh
# $Id: autogen.sh,v 1.1 2004/01/28 12:11:03 damitha Exp $
#
# Copyright (c) 2002 Daniel Elstner <da...@gmx.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License VERSION 2 as
# published by the Free Software Foundation. You are not allowed to
# use any other version of the license; unless you got the explicit
# permission from the author to do so.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dir=`echo "$0" | sed 's,[^/]*$,,'`
test "x${dir}" = "x" && dir='.'
if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
then
echo "This script must be executed directly from the source directory."
exit 1
fi
rm -f config.cache acconfig.h
echo "- libtoolize." && \
libtoolize --force && \
echo "- aclocal." && \
aclocal && \
echo "- autoconf." && \
autoconf && \
echo "- autoheader." && \
autoheader && \
echo "- automake." && \
automake --add-missing --gnu &&
#echo && \
#./configure "$@" && exit 0
exit 1
1.1 ws-axis/c/src/client/samples/interoptests/cbase/configure.ac
Index: configure.ac
===================================================================
AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
AM_INIT_AUTOMAKE(0.3)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_OUTPUT(Makefile)
1.1 ws-axis/c/src/client/samples/interoptests/cbase/runconfig
Index: runconfig
===================================================================
#!/bin/bash
./configure --bindir=$AXISCPP_HOME/bin
1.2 +1 -1 ws-axis/c/src/server/samples/interoptests/cbase/SOAPStruct.c
Index: SOAPStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/cbase/SOAPStruct.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPStruct.c 28 Jan 2004 10:16:36 -0000 1.1
+++ SOAPStruct.c 28 Jan 2004 12:11:11 -0000 1.2
@@ -29,7 +29,7 @@
pSZX->SerializeAsElement(pSZ, "varInt", (void*)&(param->varInt), XSD_INT);
pSZX->SerializeAsElement(pSZ, "varFloat", (void*)&(param->varFloat), XSD_FLOAT);
- pSZX->SerializeEndElementOfType(pSZ, Axis_TypeName_SOAPStruct, 0);
+ pSZX->SerializeEndElementOfType(pSZ, Axis_TypeName_SOAPStruct);
return AXIS_SUCCESS;
}
1.1 ws-axis/c/src/server/samples/interoptests/cbase/Makefile.am
Index: Makefile.am
===================================================================
lib_LTLIBRARIES = libinteropbase.la
SUBDIRS =
libinteropbase_la_SOURCES = InteropTestPortType.c InteropTestPortTypeService.c SOAPStruct.c InteropTestPortTypeWrapper.c
libinteropbase_la_LIBADD = -L$(AXISCPP_HOME)/lib/expat -lexpat -ldl -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
1.1 ws-axis/c/src/server/samples/interoptests/cbase/autogen.sh
Index: autogen.sh
===================================================================
#! /bin/sh
# $Id: autogen.sh,v 1.1 2004/01/28 12:11:11 damitha Exp $
#
# Copyright (c) 2002 Daniel Elstner <da...@gmx.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License VERSION 2 as
# published by the Free Software Foundation. You are not allowed to
# use any other version of the license; unless you got the explicit
# permission from the author to do so.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dir=`echo "$0" | sed 's,[^/]*$,,'`
test "x${dir}" = "x" && dir='.'
if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
then
echo "This script must be executed directly from the source directory."
exit 1
fi
rm -f config.cache acconfig.h
echo "- libtoolize." && \
libtoolize --force && \
echo "- aclocal." && \
aclocal && \
echo "- autoconf." && \
autoconf && \
echo "- autoheader." && \
autoheader && \
echo "- automake." && \
automake --add-missing --gnu &&
#echo && \
#./configure "$@" && exit 0
exit 1
1.1 ws-axis/c/src/server/samples/interoptests/cbase/configure.ac
Index: configure.ac
===================================================================
AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
AM_INIT_AUTOMAKE(0.3)
AM_CONFIG_HEADER(config.h)
LDFLAGS="-s"
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_OUTPUT(Makefile)
1.1 ws-axis/c/src/server/samples/interoptests/cbase/runconfig
Index: runconfig
===================================================================
#!/bin/bash
./configure --libdir=$AXIS_HOME/webservices