Moved XML classes to the main library.

git-svn-id: http://yate.null.ro/svn/yate/trunk@5864 acf43c95-373e-0410-b603-e72c3f656dc1
2014-07-04 15:18:11 +00:00 · 2014-07-04 15:18:11 +00:00 · 05a21a1d34
parent a2fe379e02
commit 05a21a1d34
21 changed files with 79 additions and 349 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -30,8 +30,8 @@ SLIBS:= $(YLIB) libyate.so \
 	libyategsm.so.@PACKAGE_VERSION@ libyategsm.so \
 	libyatemgcp.so.@PACKAGE_VERSION@ libyatemgcp.so \
 	libyatejabber.so.@PACKAGE_VERSION@ libyatejabber.so
-ILIBS:= ygsm yxml
-INCS := yateclass.h yatemime.h yatengine.h yatephone.h yatecbase.h
+ILIBS:= ygsm
+INCS := yateclass.h yatemime.h yatengine.h yatephone.h yatecbase.h yatexml.h
 GENS := yateversn.h
 LIBS :=
 MAN8 := yate.8 yate-config.8
--- a/configure.in
+++ b/configure.in
@ -1638,7 +1638,6 @@ AC_CONFIG_FILES([packing/rpm/yate.spec
                 libs/yrtp/Makefile
                 libs/ysdp/Makefile
 		 libs/yiax/Makefile
-		 libs/yxml/Makefile
 		 libs/yjabber/Makefile
 		 libs/yscript/Makefile
 		 libs/ymgcp/Makefile
--- a/engine/Makefile.in
+++ b/engine/Makefile.in
@ -28,7 +28,7 @@ CLINC:= $(PINC) @top_srcdir@/yatecbase.h
 LIBS :=
 CLSOBJS := TelEngine.o ObjList.o HashList.o Mutex.o Thread.o Socket.o Resolver.o \
 	String.o DataBlock.o NamedList.o \
-	URI.o Mime.o Array.o Iterator.o \
+	URI.o Mime.o Array.o Iterator.o XML.o \
 	Hasher.o YMD5.o YSHA1.o YSHA256.o Base64.o Cipher.o Compressor.o
 ENGOBJS := Configuration.o Message.o Engine.o Plugin.o
 TELOBJS := DataFormat.o Channel.o
--- a/libs/yxml/XML.cpp
+++ b/libs/yxml/XML.cpp
--- a/libs/ygsm/Makefile.in
+++ b/libs/ygsm/Makefile.in
@ -6,12 +6,12 @@ DEBUG :=
 CXX  := @CXX@ -Wall
 AR  := ar
 DEFS :=
-INCLUDES := -I@top_srcdir@ -I../..  -I@srcdir@/../yxml -I@srcdir@
+INCLUDES := -I@top_srcdir@ -I../..  -I@srcdir@
 CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= @LDFLAGS@
 SONAME_OPT := @SONAME_OPT@
 YATELIBS := -L../.. -lyate @LIBS@
-INCFILES := @top_srcdir@/yateclass.h @srcdir@/../yxml/yatexml.h @srcdir@/yategsm.h
+INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatexml.h @srcdir@/yategsm.h

 PROGS=
 LIBS = libyategsm.a
@ -20,8 +20,6 @@ LIBD_DEV:= libyategsm.so
 LIBD_VER:= $(LIBD_DEV).@PACKAGE_VERSION@
 LIBD:= ../../$(LIBD_VER) ../../$(LIBD_DEV)

-YXML:= ../yxml/libyatexml.a
-
 LOCALFLAGS =
 LOCALLIBS =
 COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
@ -59,7 +57,7 @@ clean:
 Makefile: @srcdir@/Makefile.in ../../config.status
 	cd ../.. && ./config.status

-../../$(LIBD_VER): $(OBJS) $(YXML)
+../../$(LIBD_VER): $(OBJS)
 	$(LINK) -o $@ $(SONAME_OPT)$(LIBD_VER) $^ $(YATELIBS)

 ../../$(LIBD_DEV): ../../$(LIBD_VER)
@ -67,6 +65,3 @@ Makefile: @srcdir@/Makefile.in ../../config.status

 $(LIBS): $(OBJS)
 	$(AR) rcs $@ $^
-
-$(YXML):
-	$(MAKE) -C ../yxml
--- a/libs/yjabber/Makefile.in
+++ b/libs/yjabber/Makefile.in
@ -6,12 +6,12 @@ DEBUG :=
 CXX  := @CXX@ -Wall
 AR  := ar
 DEFS :=
-INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@/../yxml -I@srcdir@
+INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
 CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= @LDFLAGS@
 SONAME_OPT := @SONAME_OPT@
 YATELIBS := -L../.. -lyate @LIBS@
-INCFILES := @top_srcdir@/yateclass.h @srcdir@/../yxml/yatexml.h @srcdir@/xmpputils.h @srcdir@/yatejabber.h @srcdir@/yatejingle.h
+INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatexml.h @srcdir@/xmpputils.h @srcdir@/yatejabber.h @srcdir@/yatejingle.h

 PROGS=
 LIBS = libyatejabber.a
@ -19,7 +19,6 @@ OBJS = xmpputils.o jbstream.o jbengine.o session.o jgengine.o
 LIBD_DEV:= libyatejabber.so
 LIBD_VER:= $(LIBD_DEV).@PACKAGE_VERSION@
 LIBD:= ../../$(LIBD_VER) ../../$(LIBD_DEV)
-YXML:= ../yxml/libyatexml.a

 LOCALFLAGS =
 LOCALLIBS =
@ -58,7 +57,7 @@ clean:
 Makefile: @srcdir@/Makefile.in ../../config.status
 	cd ../.. && ./config.status

-../../$(LIBD_VER): $(OBJS) $(YXML)
+../../$(LIBD_VER): $(OBJS)
 	$(LINK) -o $@ $(SONAME_OPT)$(LIBD_VER) $^ $(YATELIBS)

 ../../$(LIBD_DEV): ../../$(LIBD_VER)
@ -66,6 +65,3 @@ Makefile: @srcdir@/Makefile.in ../../config.status

 $(LIBS): $(OBJS)
 	$(AR) rcs $@ $^
-
-$(YXML):
-	$(MAKE) -C ../yxml
--- a/libs/yxml/.cvsignore
+++ b/libs/yxml/.cvsignore
@ -1,8 +0,0 @@
-Makefile
-YateLocal*
-core*
-*.o
-*.a
-*.orig
-*~
-.*.swp
--- a/libs/yxml/Makefile.in
+++ b/libs/yxml/Makefile.in
@ -1,57 +0,0 @@
-# Makefile
-# This file holds the make rules for the libyatexml
-
-DEBUG :=
-
-CXX  := @CXX@ -Wall
-AR  := ar
-DEFS :=
-INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= @LDFLAGS@
-YATELIBS := -L../.. -lyate @LIBS@
-INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatexml.h
-
-PROGS=
-LIBS = libyatexml.a
-OBJS = XML.o
-
-LOCALFLAGS =
-LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-LINK = $(CXX) $(LDFLAGS)
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-# include optional local make rules
-include YateLocal.mak
-
-.PHONY: all debug ddebug xdebug
-all: $(LIBS) $(PROGS)
-
-debug:
-	$(MAKE) all DEBUG=-g3 MODSTRIP=
-
-ddebug:
-	$(MAKE) all DEBUG='-g3 -DDEBUG' MODSTRIP=
-
-xdebug:
-	$(MAKE) all DEBUG='-g3 -DXDEBUG' MODSTRIP=
-
-.PHONY: strip
-strip: all
-	strip --strip-debug --discard-locals $(PROGS)
-
-.PHONY: clean
-clean:
-	@-$(RM) $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
-
-%.o: @srcdir@/%.cpp $(INCFILES)
-	$(COMPILE) -c $<
-
-Makefile: @srcdir@/Makefile.in ../../config.status
-	cd ../.. && ./config.status
-
-libyatexml.a: $(OBJS)
-	$(AR) rcs $@ $^
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@ -308,9 +308,9 @@ $(JUSTSIG) server/wpcard.yate server/tdmcard.yate server/zapcard.yate: LOCALLIBS
 sig/ss7_lnp_ansi.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig -I@top_srcdir@/libs/yasn
 sig/ss7_lnp_ansi.yate: LOCALLIBS = -lyatesig -L../libs/yasn -lyasn

-sig/camel_map.yate: ../libs/yasn/libyasn.a ../libs/yxml/libyatexml.a
-sig/camel_map.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig -I@top_srcdir@/libs/yasn -I@top_srcdir@/libs/yxml
-sig/camel_map.yate: LOCALLIBS = -lyatesig -L../libs/yasn -lyasn -L../libs/yxml -lyatexml
+sig/camel_map.yate: ../libs/yasn/libyasn.a
+sig/camel_map.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig -I@top_srcdir@/libs/yasn
+sig/camel_map.yate: LOCALLIBS = -lyatesig -L../libs/yasn -lyasn

 server/analogdetect.yate: ../libs/ymodem/libyatemodem.a
 server/analogdetect.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymodem
@ -334,7 +334,7 @@ yiaxchan.yate: LOCALFLAGS = -I@top_srcdir@/libs/yiax
 yiaxchan.yate: LOCALLIBS = -L../libs/yiax -lyateiax

 yjinglechan.yate jabber/jabberserver.yate jabber/jbfeatures.yate client/jabberclient.yate: ../libyatejabber.so
-yjinglechan.yate jabber/jabberserver.yate jabber/jbfeatures.yate client/jabberclient.yate: LOCALFLAGS = -I@top_srcdir@/libs/yxml -I@top_srcdir@/libs/yjabber
+yjinglechan.yate jabber/jabberserver.yate jabber/jbfeatures.yate client/jabberclient.yate: LOCALFLAGS = -I@top_srcdir@/libs/yjabber
 yjinglechan.yate jabber/jabberserver.yate jabber/jbfeatures.yate client/jabberclient.yate: LOCALLIBS = -lyatejabber

 server/dbpbx.yate server/pbxassist.yate: ../libs/ypbx/libyatepbx.a
@ -393,13 +393,9 @@ rmanager.yate: EXTERNLIBS = $(COREDUMP_LIB)
 qt4/updater.yate: EXTERNFLAGS = $(QT4_INC_NET)
 qt4/updater.yate: EXTERNLIBS = $(QT4_LIB_NET)

-server/sipfeatures.yate: ../libs/yxml/libyatexml.a
-server/sipfeatures.yate: LOCALFLAGS = -I@top_srcdir@/libs/yxml
-server/sipfeatures.yate: LOCALLIBS = -L../libs/yxml -lyatexml
-
-javascript.yate: ../libyatescript.so ../libs/ypbx/libyatepbx.a ../libs/yxml/libyatexml.a
-javascript.yate: LOCALFLAGS = -I@top_srcdir@/libs/yscript -I@top_srcdir@/libs/ypbx -I@top_srcdir@/libs/yxml
-javascript.yate: LOCALLIBS = -lyatescript -L../libs/ypbx -lyatepbx -L../libs/yxml -lyatexml
+javascript.yate: ../libyatescript.so ../libs/ypbx/libyatepbx.a
+javascript.yate: LOCALFLAGS = -I@top_srcdir@/libs/yscript -I@top_srcdir@/libs/ypbx
+javascript.yate: LOCALLIBS = -lyatescript -L../libs/ypbx -lyatepbx

 zlibcompress.yate: EXTERNFLAGS = $(ZLIB_INC)
 zlibcompress.yate: EXTERNLIBS = $(ZLIB_LIB)
@ -435,9 +431,6 @@ server/ysnmpagent.yate: LOCALLIBS = -L../libs/yasn -lyasn -L../libs/ysnmp -lysnm
 ../libs/ymodem/libyatemodem.a: @top_srcdir@/libs/ymodem/yatemodem.h
 	$(MAKE) -C ../libs/ymodem

-../libs/yxml/libyatexml.a: @top_srcdir@/libs/yxml/yatexml.h
-	$(MAKE) -C ../libs/yxml
-
 ../libyatejabber.so ../libs/yjabber/libyatejabber.a: @top_srcdir@/libs/yjabber/xmpputils.h @top_srcdir@/libs/yjabber/yatejabber.h @top_srcdir@/libs/yjabber/yatejingle.h
 	$(MAKE) -C ../libs/yjabber

--- a/windows/Libyate.vcproj
+++ b/windows/Libyate.vcproj
@ -679,6 +679,28 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\engine\XML.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\engine\YMD5.cpp"
 				>
--- a/windows/YATE.sln
+++ b/windows/YATE.sln
@ -348,11 +348,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libysig", "libysig.vcproj",
 		{254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyxml", "libyxml.vcproj", "{E351C8F9-20A7-4363-909C-1A06E9BEAA6B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ysigchan", "_ysigchan.vcproj", "{14D976D9-76B8-48D3-8312-4539D4B610BC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{496A2084-FFED-4F73-8C85-170042A34F38} = {496A2084-FFED-4F73-8C85-170042A34F38}
--- a/windows/_camel_map.vcproj
+++ b/windows/_camel_map.vcproj
@ -49,8 +49,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\ysig,..\libs\yxml,..\libs\yasn"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;LIBYXML_STATIC;LIBYASN_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories=".,..,..\libs\ysig,..\libs\yasn"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;LIBYASN_STATIC;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@ -144,8 +144,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\ysig,..\libs\yxml,..\libs\yasn"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;LIBYXML_STATIC;LIBYASN_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories=".,..,..\libs\ysig,..\libs\yasn"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;LIBYASN_STATIC;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
--- a/windows/_jabberclient.vcproj
+++ b/windows/_jabberclient.vcproj
@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml,..\libs\yjabber"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml,..\libs\yjabber"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
--- a/windows/_jabberserver.vcproj
+++ b/windows/_jabberserver.vcproj
@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml,..\libs\yjabber"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml,..\libs\yjabber"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
--- a/windows/_javascript.vcproj
+++ b/windows/_javascript.vcproj
@ -48,8 +48,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yscript,..\libs\ypbx,..\libs\yxml"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;LIBYPBX_STATIC;LIBYXML_STATIC"
+				AdditionalIncludeDirectories=".,..,..\libs\yscript,..\libs\ypbx"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;LIBYPBX_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@ -143,8 +143,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yscript,..\libs\ypbx,..\libs\yxml"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;LIBYPBX_STATIC;LIBYXML_STATIC"
+				AdditionalIncludeDirectories=".,..,..\libs\yscript,..\libs\ypbx"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;LIBYPBX_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
--- a/windows/_jbfeatures.vcproj
+++ b/windows/_jbfeatures.vcproj
@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml,..\libs\yjabber"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml,..\libs\yjabber"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
--- a/windows/_sipfeatures.vcproj
+++ b/windows/_sipfeatures.vcproj
@ -48,8 +48,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;LIBYXML_STATIC"
+				AdditionalIncludeDirectories=".,.."
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -145,8 +145,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;LIBYXML_STATIC"
+				AdditionalIncludeDirectories=".,.."
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
--- a/windows/_yjinglechan.vcproj
+++ b/windows/_yjinglechan.vcproj
@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yjabber,..\libs\yxml"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -144,7 +144,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yjabber,..\libs\yxml"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
--- a/windows/libyjabber.vcproj
+++ b/windows/libyjabber.vcproj
@ -43,8 +43,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yjabber,..\libs\yxml"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;LIBYXML_EXPORTS;LIBYJABBER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;LIBYJABBER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@ -125,8 +125,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yjabber,..\libs\yxml"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;LIBYXML_EXPORTS;LIBYJABBER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories=".,..,..\libs\yjabber"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;LIBYJABBER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
--- a/windows/libyxml.vcproj
+++ b/windows/libyxml.vcproj
@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libyxml"
-	ProjectGUID="{E351C8F9-20A7-4363-909C-1A06E9BEAA6B}"
-	RootNamespace="libyxml"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug\yxml"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;LIBYXML_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug\yxml/libyxml.pch"
-				AssemblerListingLocation=".\Debug\yxml/"
-				ObjectFile=".\Debug\yxml/"
-				ProgramDataBaseFileName=".\Debug\yxml/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Debug\libyxml.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/libyxml.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release\yxml"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..,..\libs\yxml"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;LIBYXML_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\yxml/libyxml.pch"
-				AssemblerListingLocation=".\Release\yxml/"
-				ObjectFile=".\Release\yxml/"
-				ProgramDataBaseFileName=".\Release\yxml/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release\libyxml.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/libyxml.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\libs\yxml\XML.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\libs\yxml\yatexml.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/libs/yxml/yatexml.h
+++ b/libs/yxml/yatexml.h
@ -22,24 +22,12 @@
 #ifndef __YATEXML_H
 #define __YATEXML_H

+#ifndef __cplusplus
+#error C++ is required
+#endif
+
 #include <yateclass.h>

-#ifdef _WINDOWS
-
-#ifdef LIBYXML_EXPORTS
-#define YXML_API __declspec(dllexport)
-#else
-#ifndef LIBYXML_STATIC
-#define YXML_API __declspec(dllimport)
-#endif
-#endif
-
-#endif /* _WINDOWS */
-
-#ifndef YXML_API
-#define YXML_API
-#endif
-
 /**
 * Holds all Telephony Engine related classes.
 */
@ -59,7 +47,7 @@ class XmlText;
 class XmlDoctype;


-struct YXML_API XmlEscape {
+struct YATE_API XmlEscape {
    /**
     * Value to match
     */
@ -75,7 +63,7 @@ struct YXML_API XmlEscape {
 * A Serial Access Parser (SAX) for arbitrary XML data
 * @short Serial Access XML Parser
 */
-class YXML_API XmlSaxParser : public DebugEnabler
+class YATE_API XmlSaxParser : public DebugEnabler
 {
 public:
    enum Error {
@ -513,7 +501,7 @@ protected:
 * Xml Parent for a Xml child
 * @short Xml Parent
 */
-class YXML_API XmlParent
+class YATE_API XmlParent
 {
 public:
    /**
@ -613,7 +601,7 @@ public:
 * A Document Object Model (DOM) parser for XML documents and fragments
 * @short Document Object Model XML Parser
 */
-class YXML_API XmlDomParser : public XmlSaxParser
+class YATE_API XmlDomParser : public XmlSaxParser
 {
    friend class XmlChild;
 public:
@ -731,7 +719,7 @@ private:
 * Xml Child for Xml document
 * @short Xml Child
 */
-class YXML_API XmlChild : public GenObject
+class YATE_API XmlChild : public GenObject
 {
    YCLASS(XmlChild,GenObject)
    friend class XmlDomParser;
@ -796,7 +784,7 @@ public:
 * Xml Declaration for Xml document
 * @short Xml Declaration
 */
-class YXML_API XmlDeclaration : public XmlChild
+class YATE_API XmlDeclaration : public XmlChild
 {
    YCLASS(XmlDeclaration,XmlChild)
 public:
@ -854,7 +842,7 @@ private:
 * Xml Fragment a fragment from a Xml document
 * @short Xml Fragment
 */
-class YXML_API XmlFragment : public XmlParent
+class YATE_API XmlFragment : public XmlParent
 {
 public:

@ -964,7 +952,7 @@ private:
 * Xml Document
 * @short Xml Document
 */
-class YXML_API XmlDocument : public XmlParent
+class YATE_API XmlDocument : public XmlParent
 {
 public:

@ -1091,7 +1079,7 @@ private:
 * @short Xml Element
 */

-class YXML_API XmlElement : public XmlChild, public XmlParent
+class YATE_API XmlElement : public XmlChild, public XmlParent
 {
    YCLASS(XmlElement,XmlChild)
 public:
@ -1587,7 +1575,7 @@ private:
 * A Xml Comment from Xml document
 * @short Xml Comment
 */
-class YXML_API XmlComment : public XmlChild
+class YATE_API XmlComment : public XmlChild
 {
    YCLASS(XmlComment,XmlChild)
 public:
@ -1637,7 +1625,7 @@ private:
 * A Xml CData from Xml document
 * @short Xml Declaration
 */
-class YXML_API XmlCData : public XmlChild
+class YATE_API XmlCData : public XmlChild
 {
    YCLASS(XmlCData,XmlChild)
 public:
@ -1688,7 +1676,7 @@ private:
 * A Xml Declaration for Xml document
 * @short Xml Declaration
 */
-class YXML_API XmlText : public XmlChild
+class YATE_API XmlText : public XmlChild
 {
    YCLASS(XmlText,XmlChild)
 public:
@ -1751,7 +1739,7 @@ private:
    String m_text;                        // The text
 };

-class YXML_API XmlDoctype : public XmlChild
+class YATE_API XmlDoctype : public XmlChild
 {
    YCLASS(XmlDoctype,XmlChild)
 public: