axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ros...@apache.org
Subject cvs commit: xml-axis/c/vc/server/simple_axis_server SimpleAxisServer.dsp
Date Fri, 12 Sep 2003 14:25:24 GMT
roshan      2003/09/12 07:25:24

  Modified:    c/src/server/simple_axis_server ServerHelper.cpp
                        ServerHelper.h SimpleAxisServer.cpp
               c/vc/server/simple_axis_server SimpleAxisServer.dsp
  Log:
  minor changes
  
  Revision  Changes    Path
  1.2       +1 -3      xml-axis/c/src/server/simple_axis_server/ServerHelper.cpp
  
  Index: ServerHelper.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/simple_axis_server/ServerHelper.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerHelper.cpp	9 Sep 2003 06:52:01 -0000	1.1
  +++ ServerHelper.cpp	12 Sep 2003 14:25:24 -0000	1.2
  @@ -1,8 +1,6 @@
   #include <iostream>
   #include <stdio.h>
  -#include <string>
  -
  -using namespace std;
  +#include "ServerHelper.h"
   
   int getSeperatedHTTPParts(string sClientReqStream, string& sHTTPHeaders, string&
sHTTPBody) {
   			
  
  
  
  1.2       +5 -0      xml-axis/c/src/server/simple_axis_server/ServerHelper.h
  
  Index: ServerHelper.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/simple_axis_server/ServerHelper.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerHelper.h	9 Sep 2003 06:52:01 -0000	1.1
  +++ ServerHelper.h	12 Sep 2003 14:25:24 -0000	1.2
  @@ -1,5 +1,10 @@
  +#if !defined(AFX_SERVERHELPER_H__INCLUDED_)
  +#define AFX_SERVERHELPER_H__INCLUDED_
  +
   #include <string>
   
   using namespace std;
   
   int getSeperatedHTTPParts(string sClientReqStream, string& sHTTPHeaders, string&
sHTTPBody);
  +
  +#endif // !defined(AFX_SERVERHELPER_H__INCLUDED_)
  \ No newline at end of file
  
  
  
  1.2       +21 -10    xml-axis/c/src/server/simple_axis_server/SimpleAxisServer.cpp
  
  Index: SimpleAxisServer.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/simple_axis_server/SimpleAxisServer.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleAxisServer.cpp	9 Sep 2003 06:52:01 -0000	1.1
  +++ SimpleAxisServer.cpp	12 Sep 2003 14:25:24 -0000	1.2
  @@ -11,12 +11,17 @@
   #include <unistd.h>
   #endif
   
  -#include <stdio.h>
  +//#include <stdio.h>
   #include "../../common/Packet.h"
   #include "ServerHelper.h"
   
   #define MAXPENDING 5    /* Maximum outstanding connection requests */
   #define RCVBUFSIZE 1000   /* Size of receive buffer */
  +#ifdef WIN32
  +#define AXIS_SOCKET_ERROR SOCKET_ERROR
  +#else //Linux
  +#define AXIS_SOCKET_ERROR 1
  +#endif
   
   char echoBuffer[RCVBUFSIZE];        /* Buffer for echo string */
   const char *pcHttpBody;
  @@ -36,13 +41,13 @@
   	str->so.http.ip_headercount = 0;
   	str->so.http.uri_path = "http://someurl/axis/Calculator";
   
  -	printf("soap request :\n %s\n", echoBuffer);
  +	//DEBUG line
  +	//printf("soap request :\n %s\n", echoBuffer);
   //	wprintf(L"soap request :\n %s\n", ip);
   
   	initialize_module();
   	
  -	process_request(str);
  -	printf("\n");
  +	process_request(str);	
   	
   	uninitialize_module();
   	free(str->so.http.ip_headers);
  @@ -58,7 +63,7 @@
   
   	int iMsgSize = strlen(res);
   	
  -	if (send(iClntSocket, res, iMsgSize, 0) == SOCKET_ERROR)
  +	if (send(iClntSocket, res, iMsgSize, 0) == AXIS_SOCKET_ERROR)
   		printf("%s\n","send() failed");	
   
   	return 0;
  @@ -84,7 +89,7 @@
   
   	int iMsgSize = strlen(res);
   
  -	if (send(iClntSocket, res, iMsgSize, 0) == SOCKET_ERROR)
  +	if (send(iClntSocket, res, iMsgSize, 0) == AXIS_SOCKET_ERROR)
   		printf("%s\n","send() failed");
   
   	return 0;
  @@ -169,7 +174,8 @@
       
       /* clntSock is connected to a client! */
       
  -    printf("Handling client %s\n", inet_ntoa(echoClntAddr.sin_addr));
  +	//Debug line
  +    //printf("Handling client %s\n", inet_ntoa(echoClntAddr.sin_addr));
   
       return clntSock;
   }
  @@ -210,7 +216,11 @@
   
   	executeWork();		
   
  +	#ifdef WIN32
   	closesocket(clntSocket);    /* Close client socket */
  +	#else //Linux
  +	close(clntSocket);
  +	#endif
   }
   
   int main(int argc, char *argv[ ])
  @@ -238,9 +248,9 @@
   
   
   	if (argc < 2) {
  -		printf("Problem occured.\nUsage: %s <Server Port>", argv[0]);		
  +		printf("Problem occured.\nUsage: %s <Server Port>", argv[0]);	
   		exit(1);
  -	}	
  +	}
   
   	#ifdef WIN32
   	if (WSAStartup(MAKEWORD(2, 0), &wsaData) != 0) /* Load Winsock 2.0 DLL */
  @@ -281,7 +291,8 @@
   		{        
   			if (FD_ISSET(servSock[0], &sockSet))
   			{
  -				printf("Request on port %d (cmd-line position):  \n", 0);
  +				//DEBUG line
  +				//printf("Request on port %d (cmd-line position):  \n", 0);
   				handleTCPClient(acceptTCPConnection(servSock[0]));				
   			}
   		}
  
  
  
  1.4       +4 -88     xml-axis/c/vc/server/simple_axis_server/SimpleAxisServer.dsp
  
  Index: SimpleAxisServer.dsp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/vc/server/simple_axis_server/SimpleAxisServer.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleAxisServer.dsp	11 Sep 2003 12:29:42 -0000	1.3
  +++ SimpleAxisServer.dsp	12 Sep 2003 14:25:24 -0000	1.4
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /nologo /W3 /O2 /I "../../../include ../../include" /D "WIN32" /D "NDEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /O2 /I "../../../include ../../include" /D "WIN32" /D "NDEBUG"
/D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 Common.lib Soap.lib wsdd.lib xerces-c_2D.lib wsock32.lib /nologo /subsystem:console
/pdb:"../../../release/win32/SimpleAxisServer.pdb" /machine:I386 /out:"../../../release/win32/SimpleAxisServer.exe"
/libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc"
  +# ADD LINK32 Common.lib Soap.lib wsdd.lib engine.lib xerces-c_2D.lib wsock32.lib /nologo
/subsystem:console /pdb:"../../../release/win32/SimpleAxisServer.pdb" /machine:I386 /out:"../../../release/win32/SimpleAxisServer.exe"
/libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc"
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "SimpleAxisServer - Win32 Debug"
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include ../../include" /D "WIN32" /D
"_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../include ../../include" /D "WIN32"
/D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib xerces-c_2D.lib wsock32.lib /nologo /subsystem:console
/debug /machine:I386 /out:"../../../release/win32/SimpleAxisServer_D.exe" /pdbtype:sept /libpath:"../../../lib/win32/axis"
/libpath:"../../../lib/win32/xercesc"
  +# ADD LINK32 Engine_D.lib Common_D.lib Soap_D.lib wsdd_D.lib xerces-c_2D.lib wsock32.lib
/nologo /subsystem:console /debug /machine:I386 /out:"../../../release/win32/SimpleAxisServer_D.exe"
/pdbtype:sept /libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc"
   
   !ENDIF 
   
  @@ -88,54 +88,10 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
   # Begin Source File
   
  -SOURCE=..\..\..\src\engine\AppScopeHandlerPool.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\Axis.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\AxisEngine.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\DeserializerPool.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\HandlerChain.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\HandlerLoader.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\HandlerPool.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\RequestScopeHandlerPool.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\SerializerPool.cpp
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\..\..\src\server\simple_axis_server\ServerHelper.cpp
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\..\src\engine\SessionScopeHandlerPool.cpp
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\SharedObject.cpp
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\..\..\src\server\simple_axis_server\SimpleAxisServer.cpp
   # End Source File
   # End Group
  @@ -144,47 +100,7 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl"
   # Begin Source File
   
  -SOURCE=..\..\..\src\engine\AppScopeHandlerPool.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\AxisEngine.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\DeserializerPool.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\HandlerChain.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\HandlerLoader.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\HandlerPool.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\RequestScopeHandlerPool.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\SerializerPool.h
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\..\..\src\server\simple_axis_server\ServerHelper.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\SessionScopeHandlerPool.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\..\src\engine\SharedObject.h
   # End Source File
   # End Group
   # Begin Group "Resource Files"
  
  
  

Mime
View raw message