Changeset 2031

Timestamp:

04/26/10 09:24:53 (4 months ago)

Author:

x.pechoultres@…

Message:

Xmlo and Soap use Sax instead of deprected Expat module

Location:

trunk/modules

Files:

• Soap/source/response_parse.cl (modified) (2 diffs)
• Soap/source/soap_service.cl (modified) (2 diffs)
• Xmlo/init.cl (modified) (1 diff)
• Xmlo/source/readxml.cl (modified) (1 diff)

trunk/modules/Soap/source/response_parse.cl

@@ -20 +20 @@
                 (//[-100] == Found an attached SOAP fault report,
                 FAULTREPORT? := true),
-        Expat/set_handler(clientResponseTagEnter, clientResponseTagLeave)]
+        Sax/set_handler(clientResponseTagEnter, clientResponseTagLeave)]
 
 [Xmlo/tagToClass(ns:{"soap", "Soap", "SOAP"}, t:{"Fault","fault","FAULT"}) : class ->
-        Expat/set_handler(fault_enter,fault_leave),
+        Sax/set_handler(fault_enter,fault_leave),
         Fault]
 
@@ -42 +42 @@
         FAULTREPORT? := false,
         XMLPORT := xml,
-        Expat/sax(xml, clientResponseTagEnter, clientResponseTagLeave),
+        Sax/sax(xml, clientResponseTagEnter, clientResponseTagLeave),
         if FAULTREPORT?
                 let p := use_as_output(Wcl/wcl_handler_instance.Wcl/report.target)

trunk/modules/Soap/source/soap_service.cl

@@ -117 +117 @@
         //[-100] == parse text SOAP message ,
         PORT_IN := from,
-        Expat/sax(from, soap_message_enter, soap_message_leave),
+        Sax/sax(from, soap_message_enter, soap_message_leave),
         //[-100] == SOAP text/xml parsed  end?=~S // eof?(PORT_IN),
         bleedInput(PORT_IN),
@@ -149 +149 @@
                                 error("Verification failed : ~A", dec_p7.Openssl/verify_message),
                         PORT_IN := b,
-                        Expat/sax(b, soap_message_enter, soap_message_leave),
+                        Sax/sax(b, soap_message_enter, soap_message_leave),
                         ctx.sender := Openssl/get_signers(dec_p7)[1],
                         (SOAP_IN as SoapIn).secure_context := ctx,

trunk/modules/Xmlo/init.cl

@@ -4 +4 @@
 
 
-(use_module("Expat"))
+(use_module("Sax"))
+(use_module("Iconv"))
 
 Xmlo :: module(
-        uses = list(Expat),
+        uses = list(Sax,Iconv),
         made_of = list("xmlize","readxml","printxml"),
         source = "source",

trunk/modules/Xmlo/source/readxml.cl

@@ -166 +166 @@
 [unXml!(self:port) : any ->
         STACK := list<any>(),
-        Expat/sax(self, enterTag, leaveTag),
+        Sax/sax(self, enterTag, leaveTag),
         STACK[1]]