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 su...@apache.org on 2004/03/26 14:07:59 UTC
cvs commit: ws-axis/c/vc/soap SoapLibrary.dsp
susantha 2004/03/26 05:07:59
Modified: c/src/server/simple_axis_server ServerHelper.cpp
SimpleAxisServer.cpp
c/src/soap SoapParserExpat.cpp SoapParserExpat.h
c/src/xml Attribute.cpp Attribute.h Element.cpp Element.h
Event.cpp Event.h SimpleAttribute.cpp
SimpleAttribute.h StartElement.cpp StartElement.h
c/vc AxisClientDLL.dsp AxisServerDLL.dsp
c/vc/server/apache1_3 Apache1_3Module.dsp
c/vc/server/apache2_0 Apache2_0Module.dsp
c/vc/soap SoapLibrary.dsp
Log:
Renamed Attribute class in /src/xml to SimpleAttribute.
Avoided few other problems encoutered when building server and client DLLs for windows
Revision Changes Path
1.9 +2 -2 ws-axis/c/src/server/simple_axis_server/ServerHelper.cpp
Index: ServerHelper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/ServerHelper.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServerHelper.cpp 21 Nov 2003 12:56:01 -0000 1.8
+++ ServerHelper.cpp 26 Mar 2004 13:07:58 -0000 1.9
@@ -67,8 +67,8 @@
#include <iostream>
#include <stdio.h>
-#include <axis/server/simple_axis_server/ServerHelper.h>
-#include <axis/common/AxisUtils.h>
+#include "ServerHelper.h"
+#include "../../common/AxisUtils.h"
int getSeperatedHTTPParts(string sClientReqStream, string& sHTTPHeaders, string& sHTTPBody, map<HTTP_MAP_KEYWORDS, HTTP_MAP_TYPE*> *map_HTTP_Headers) {
1.16 +7 -5 ws-axis/c/src/server/simple_axis_server/SimpleAxisServer.cpp
Index: SimpleAxisServer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/SimpleAxisServer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SimpleAxisServer.cpp 21 Nov 2003 12:56:01 -0000 1.15
+++ SimpleAxisServer.cpp 26 Mar 2004 13:07:58 -0000 1.16
@@ -75,11 +75,11 @@
#endif
//#include <stdio.h>
-#include <axis/common/Packet.h>
-#include <axis/common/AxisConfig.h>
-#include <axis/common/AxisSocketUtils.h>
-#include <axis/common/AxisTrace.h>
-#include <axis/server/simple_axis_server/ServerHelper.h>
+#include <axis/server/Packet.h>
+#include <axis/server/AxisConfig.h>
+#include "../../common/AxisSocketUtils.h"
+#include <axis/server/AxisTrace.h>
+#include "ServerHelper.h"
#define MAXPENDING 5 /* Maximum outstanding connection requests */
#define RCVBUFSIZE 1000 /* Size of receive buffer */
@@ -93,6 +93,8 @@
const char *pcHttpBody;
int iClntSocket;
map<HTTP_MAP_KEYWORDS, HTTP_MAP_TYPE*> map_HTTP_Headers;
+
+extern AxisTrace* g_pAT;
int send_response_bytes(const char * res, const void* opstream)
{
1.10 +4 -5 ws-axis/c/src/soap/SoapParserExpat.cpp
Index: SoapParserExpat.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapParserExpat.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SoapParserExpat.cpp 25 Mar 2004 16:56:16 -0000 1.9
+++ SoapParserExpat.cpp 26 Mar 2004 13:07:58 -0000 1.10
@@ -66,7 +66,6 @@
#include "../xml/Event.h"
#include "../xml/SimpleAttribute.h"
#include "../xml/StartElement.h"
-using namespace axisxml;
#include "SoapParserExpat.h"
@@ -91,11 +90,11 @@
pSE->m_NameOrValue = qn.localname;
pSE->m_Namespace = qn.uri ? qn.uri : "";
qn.MergeQNameString(NAMESPACESEPARATOR);
- Attribute *pAt = NULL;
+ SimpleAttribute *pAt = NULL;
for (int i = 0; attrs[i]; i += 2)
{
qn.SplitQNameString(attrs[i], NAMESPACESEPARATOR);
- pAt = new Attribute();
+ pAt = new SimpleAttribute();
pAt->m_Name = qn.localname;
pAt->m_Namespace = qn.uri ? qn.uri : "";
qn.MergeQNameString(NAMESPACESEPARATOR);
@@ -133,7 +132,7 @@
return;
}
}
- pLastEvent = new CharacterElement();
+ pLastEvent = new CharElement();
pLastEvent->m_NameOrValue = pTemp;
m_Events.push(pLastEvent);
pTemp[length] = replacedchar; //put back the character that was there before putting nul charactor
@@ -206,7 +205,7 @@
{
case START_ELEMENT:
{
- for (list<Attribute*>::iterator it = ((StartElement*)m_pLastEvent)->m_Attributes.begin()
+ for (list<SimpleAttribute*>::iterator it = ((StartElement*)m_pLastEvent)->m_Attributes.begin()
; it != ((StartElement*)m_pLastEvent)->m_Attributes.end(); it++)
{
m_Element.m_pchAttributes[i+0] = (*it)->m_Name.c_str();
1.3 +2 -2 ws-axis/c/src/soap/SoapParserExpat.h
Index: SoapParserExpat.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapParserExpat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapParserExpat.h 24 Mar 2004 06:57:33 -0000 1.2
+++ SoapParserExpat.h 26 Mar 2004 13:07:58 -0000 1.3
@@ -87,9 +87,9 @@
XML_Parser m_Parser;
const Ax_soapstream* m_pInputStream;
const char* m_pCurrentBuffer;
- axisxml::Event* m_pLastEvent;
+ Event* m_pLastEvent;
AnyElement m_Element;
- queue<axisxml::Event*> m_Events;
+ queue<Event*> m_Events;
map<AxisXMLString, AxisXMLString> m_NsStack;
int m_nStatus;
AXIS_TRANSPORT_STATUS m_nTransportStatus;
1.5 +0 -2 ws-axis/c/src/xml/Attribute.cpp
Index: Attribute.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Attribute.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Attribute.cpp 23 Mar 2004 05:30:09 -0000 1.4
+++ Attribute.cpp 26 Mar 2004 13:07:58 -0000 1.5
@@ -25,7 +25,6 @@
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-namespace axisxml {
Attribute::Attribute()
{
@@ -37,6 +36,5 @@
}
-}
1.2 +0 -4 ws-axis/c/src/xml/Attribute.h
Index: Attribute.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Attribute.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Attribute.h 23 Mar 2004 06:23:00 -0000 1.1
+++ Attribute.h 26 Mar 2004 13:07:58 -0000 1.2
@@ -68,8 +68,6 @@
#include <string>
using namespace std;
-namespace axisxml {
-
class Attribute
{
public:
@@ -78,8 +76,6 @@
string m_Namespace;
string m_Name;
string m_Value;
-};
-
};
#endif // !defined(AFX_ATTRIBUTE_H__93C9B708_3BA1_4933_BE5F_BEABABD92E0C__INCLUDED_)
1.5 +0 -3 ws-axis/c/src/xml/Element.cpp
Index: Element.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Element.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Element.cpp 23 Mar 2004 05:30:09 -0000 1.4
+++ Element.cpp 26 Mar 2004 13:07:58 -0000 1.5
@@ -26,8 +26,6 @@
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-namespace axisxml {
-
Element::Element()
{
@@ -38,5 +36,4 @@
}
-}
1.2 +0 -3 ws-axis/c/src/xml/Element.h
Index: Element.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Element.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Element.h 23 Mar 2004 06:23:00 -0000 1.1
+++ Element.h 26 Mar 2004 13:07:58 -0000 1.2
@@ -68,8 +68,6 @@
#include "Event.h"
-namespace axisxml {
-
class Element : public Event
{
public:
@@ -92,6 +90,5 @@
typedef Element EndElement;
-};
#endif // !defined(AFX_ELEMENT_H__93E0989D_3148_4E7B_AA81_9D1DF43975B0__INCLUDED_)
1.5 +0 -3 ws-axis/c/src/xml/Event.cpp
Index: Event.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Event.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Event.cpp 23 Mar 2004 05:30:09 -0000 1.4
+++ Event.cpp 26 Mar 2004 13:07:58 -0000 1.5
@@ -26,8 +26,6 @@
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-namespace axisxml {
-
Event::Event()
{
@@ -38,5 +36,4 @@
}
-}
1.3 +1 -5 ws-axis/c/src/xml/Event.h
Index: Event.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Event.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Event.h 24 Mar 2004 06:57:33 -0000 1.2
+++ Event.h 26 Mar 2004 13:07:58 -0000 1.3
@@ -71,8 +71,6 @@
#include <string>
using namespace std;
-namespace axisxml {
-
class Event
{
public:
@@ -83,8 +81,6 @@
virtual XML_NODE_TYPE GetType(){ return CHARACTER_ELEMENT;};
};
-typedef Event CharacterElement;
-
-};
+typedef Event CharElement;
#endif // !defined(AFX_Event_H__165AA74B_3F51_4B2E_8081_86CD8DCD86FA__INCLUDED_)
1.2 +3 -5 ws-axis/c/src/xml/SimpleAttribute.cpp
Index: SimpleAttribute.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/SimpleAttribute.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleAttribute.cpp 25 Mar 2004 16:56:16 -0000 1.1
+++ SimpleAttribute.cpp 26 Mar 2004 13:07:58 -0000 1.2
@@ -16,7 +16,7 @@
*/
//////////////////////////////////////////////////////////////////////
-// Attribute.cpp: implementation of the Attribute class.
+// SimpleAttribute.cpp: implementation of the SimpleAttribute class.
//
//////////////////////////////////////////////////////////////////////
@@ -25,18 +25,16 @@
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-namespace axisxml {
-Attribute::Attribute()
+SimpleAttribute::SimpleAttribute()
{
}
-Attribute::~Attribute()
+SimpleAttribute::~SimpleAttribute()
{
}
-}
1.2 +3 -7 ws-axis/c/src/xml/SimpleAttribute.h
Index: SimpleAttribute.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/SimpleAttribute.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleAttribute.h 25 Mar 2004 16:56:16 -0000 1.1
+++ SimpleAttribute.h 26 Mar 2004 13:07:58 -0000 1.2
@@ -68,18 +68,14 @@
#include <string>
using namespace std;
-namespace axisxml {
-
-class Attribute
+class SimpleAttribute
{
public:
- Attribute();
- virtual ~Attribute();
+ SimpleAttribute();
+ virtual ~SimpleAttribute();
string m_Namespace;
string m_Name;
string m_Value;
-};
-
};
#endif // !defined(AFX_ATTRIBUTE_H__93C9B708_3BA1_4933_BE5F_BEABABD92E0C__INCLUDED_)
1.5 +1 -3 ws-axis/c/src/xml/StartElement.cpp
Index: StartElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/StartElement.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StartElement.cpp 23 Mar 2004 05:30:09 -0000 1.4
+++ StartElement.cpp 26 Mar 2004 13:07:58 -0000 1.5
@@ -27,7 +27,6 @@
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-namespace axisxml {
StartElement::StartElement()
{
@@ -36,11 +35,10 @@
StartElement::~StartElement()
{
- for (list<Attribute*>::iterator it = m_Attributes.begin(); it != m_Attributes.end(); it++)
+ for (list<SimpleAttribute*>::iterator it = m_Attributes.begin(); it != m_Attributes.end(); it++)
{
delete *it;
}
}
-}
1.3 +1 -4 ws-axis/c/src/xml/StartElement.h
Index: StartElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/StartElement.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StartElement.h 25 Mar 2004 16:56:16 -0000 1.2
+++ StartElement.h 26 Mar 2004 13:07:58 -0000 1.3
@@ -72,18 +72,15 @@
#include "Element.h"
#include "SimpleAttribute.h"
-namespace axisxml {
-
class StartElement : public Element
{
public:
StartElement();
virtual ~StartElement();
- list<Attribute*> m_Attributes;
+ list<SimpleAttribute*> m_Attributes;
public:
virtual XML_NODE_TYPE GetType() { return START_ELEMENT;};
};
-};
#endif // !defined(AFX_STARTELEMENT_H__932C3C70_0E61_48FD_A83D_37399F6DB023__INCLUDED_)
1.4 +19 -17 ws-axis/c/vc/AxisClientDLL.dsp
Index: AxisClientDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisClientDLL.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisClientDLL.dsp 26 Mar 2004 07:36:05 -0000 1.3
+++ AxisClientDLL.dsp 26 Mar 2004 13:07:59 -0000 1.4
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="AxisClientDLL" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="AxisClient" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=AxisClientDLL - Win32 Debug
+CFG=AxisClient - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "AxisClientDLL.mak".
+!MESSAGE NMAKE /f "AxisClient.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "AxisClientDLL.mak" CFG="AxisClientDLL - Win32 Debug"
+!MESSAGE NMAKE /f "AxisClient.mak" CFG="AxisClient - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "AxisClientDLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "AxisClientDLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AxisClient - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AxisClient - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "AxisClientDLL - Win32 Release"
+!IF "$(CFG)" == "AxisClient - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -38,12 +38,13 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "../release/win32/"
+# PROP Intermediate_Dir "CRelease"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AXISCLIENTDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AXISCLIENTDLL_EXPORTS" /D "USE_EXPAT_PARSER" /D "AXIS_CLIENT_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Od /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AXISCLIENTDLL_EXPORTS" /D "USE_EXPAT_PARSER" /D "AXIS_CLIENT_LIB" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,9 +54,9 @@
# 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 /nologo /dll /machine:I386
-# ADD LINK32 libexpat.lib wsock32.lib /nologo /dll /machine:I386 /out:"../release/win32/AxisClientDLL.dll" /libpath:"../lib/expat"
+# ADD LINK32 libexpat.lib wsock32.lib /nologo /dll /pdb:none /machine:I386 /out:"../release/win32/AxisClient.dll" /libpath:"../lib/expat"
-!ELSEIF "$(CFG)" == "AxisClientDLL - Win32 Debug"
+!ELSEIF "$(CFG)" == "AxisClient - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -65,11 +66,12 @@
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../release/win32/"
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir "CDebug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AXISCLIENTDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AXISCLIENTDLL_EXPORTS" /D "USE_EXPAT_PARSER" /D "AXIS_CLIENT_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AXISCLIENTDLL_EXPORTS" /D "USE_EXPAT_PARSER" /D "AXIS_CLIENT_LIB" /FD /GZ /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,14 +81,14 @@
# 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libexpat.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../lib/expat"
+# ADD LINK32 libexpat.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"../release/win32/AxisClient.dll" /pdbtype:sept /libpath:"../lib/expat"
!ENDIF
# Begin Target
-# Name "AxisClientDLL - Win32 Release"
-# Name "AxisClientDLL - Win32 Debug"
+# Name "AxisClient - Win32 Release"
+# Name "AxisClient - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
1.4 +15 -14 ws-axis/c/vc/AxisServerDLL.dsp
Index: AxisServerDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisServerDLL.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisServerDLL.dsp 26 Mar 2004 07:36:05 -0000 1.3
+++ AxisServerDLL.dsp 26 Mar 2004 13:07:59 -0000 1.4
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="AxisServerDLL" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="AxisServer" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=AxisServerDLL - Win32 Debug
+CFG=AxisServer - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "AxisServerDLL.mak".
+!MESSAGE NMAKE /f "AxisServer.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "AxisServerDLL.mak" CFG="AxisServerDLL - Win32 Debug"
+!MESSAGE NMAKE /f "AxisServer.mak" CFG="AxisServer - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "AxisServerDLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "AxisServerDLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AxisServer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "AxisServer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "AxisServerDLL - Win32 Release"
+!IF "$(CFG)" == "AxisServer - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -39,11 +39,12 @@
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../release/win32/"
-# PROP Intermediate_Dir "Release"
+# PROP Intermediate_Dir "SRelease"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DYNALIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DYNALIB_EXPORTS" /D "USE_EXPAT_PARSER" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Od /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DYNALIB_EXPORTS" /D "USE_EXPAT_PARSER" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,9 +54,9 @@
# 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 /nologo /dll /machine:I386
-# ADD LINK32 libexpat.lib /nologo /dll /machine:I386 /libpath:"../lib/expat"
+# ADD LINK32 libexpat.lib /nologo /dll /pdb:none /machine:I386 /out:"../release/win32/AxisServer.dll" /libpath:"../lib/expat"
-!ELSEIF "$(CFG)" == "AxisServerDLL - Win32 Debug"
+!ELSEIF "$(CFG)" == "AxisServer - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -65,7 +66,7 @@
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../release/win32/"
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir "SDebug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DYNALIB_EXPORTS" /YX /FD /GZ /c
@@ -86,8 +87,8 @@
# Begin Target
-# Name "AxisServerDLL - Win32 Release"
-# Name "AxisServerDLL - Win32 Debug"
+# Name "AxisServer - Win32 Release"
+# Name "AxisServer - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
1.2 +1 -1 ws-axis/c/vc/server/apache1_3/Apache1_3Module.dsp
Index: Apache1_3Module.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/apache1_3/Apache1_3Module.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Apache1_3Module.dsp 25 Mar 2004 15:26:01 -0000 1.1
+++ Apache1_3Module.dsp 26 Mar 2004 13:07:59 -0000 1.2
@@ -54,7 +54,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 /nologo /dll /machine:I386
-# ADD LINK32 CommonLibrary.lib SoapLibrary.lib WsddLibrary.lib ServerEngineLibrary.lib XmlLibrary.lib libexpat.lib ApacheCore.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/apache1_3" /libpath:"../../../lib/expat"
+# ADD LINK32 AxisServer.lib ApacheCore.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis.dll" /libpath:"../../../release/win32" /libpath:"../../../lib/apache1_3"
# SUBTRACT LINK32 /profile
# Begin Special Build Tool
SOURCE="$(InputPath)"
1.2 +2 -2 ws-axis/c/vc/server/apache2_0/Apache2_0Module.dsp
Index: Apache2_0Module.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/apache2_0/Apache2_0Module.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Apache2_0Module.dsp 25 Mar 2004 15:26:01 -0000 1.1
+++ Apache2_0Module.dsp 26 Mar 2004 13:07:59 -0000 1.2
@@ -53,7 +53,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 /nologo /dll /machine:I386
-# ADD LINK32 CommonLibrary.lib SoapLibrary.lib WsddLibrary.lib ServerEngineLibrary.lib XmlLibrary.lib libexpat.lib libapr.lib libhttpd.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/apache2_0" /libpath:"../../../lib/expat"
+# ADD LINK32 AxisServer.lib libapr.lib libhttpd.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /libpath:"../../../release/win32" /libpath:"../../../lib/apache2_0"
!ELSEIF "$(CFG)" == "Apache2_0Module - Win32 Debug"
@@ -79,7 +79,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 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 CommonLibrary_D.lib SoapLibrary_D.lib WsddLibrary_D.lib ServerEngineLibrary_D.lib XmlLibrary_D.lib libexpat.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/apache2_0" /libpath:"../../../lib/expat"
+# ADD LINK32 AxisServer.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/apache2_0" /libpath:"../../../lib/expat"
!ENDIF
1.2 +8 -16 ws-axis/c/vc/soap/SoapLibrary.dsp
Index: SoapLibrary.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/soap/SoapLibrary.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapLibrary.dsp 25 Mar 2004 15:08:21 -0000 1.1
+++ SoapLibrary.dsp 26 Mar 2004 13:07:59 -0000 1.2
@@ -150,15 +150,15 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\include\axis\soap\Attribute.h
+SOURCE=..\..\include\axis\server\Attribute.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\axis\soap\BasicNode.h
+SOURCE=..\..\include\axis\server\BasicNode.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\axis\soap\CharacterElement.h
+SOURCE=..\..\include\axis\server\CharacterElement.h
# End Source File
# Begin Source File
@@ -166,7 +166,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\include\axis\soap\HeaderBlock.h
+SOURCE=..\..\include\axis\server\HeaderBlock.h
# End Source File
# Begin Source File
@@ -174,7 +174,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\include\axis\soap\SoapDeSerializer.h
+SOURCE=..\..\include\axis\server\SoapDeSerializer.h
# End Source File
# Begin Source File
@@ -182,19 +182,11 @@
# End Source File
# Begin Source File
-SOURCE=..\..\include\axis\soap\SoapEnvVersions.h
+SOURCE=..\..\include\axis\server\SoapFault.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\soap\SoapFault.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\soap\SoapFaults.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\axis\soap\SoapHeader.h
+SOURCE=..\..\include\axis\server\SoapHeader.h
# End Source File
# Begin Source File
@@ -210,7 +202,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\include\axis\soap\SoapSerializer.h
+SOURCE=..\..\include\axis\server\SoapSerializer.h
# End Source File
# Begin Source File