Index: SOAP-CGI.tcl
===================================================================
RCS file: /cvsroot/tclsoap/tclsoap/SOAP-CGI.tcl,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 SOAP-CGI.tcl
--- SOAP-CGI.tcl	6 Sep 2003 17:08:46 -0000	1.15
+++ SOAP-CGI.tcl	1 May 2005 05:25:44 -0000
@@ -46,8 +46,8 @@ namespace eval ::SOAP {
 	variable debuginfo   {}
 	variable interactive 0
 	
-	package require dom
 	package require SOAP
+	package require dom
 	package require XMLRPC
 	package require SOAP::Utils
         package require SOAP::http
Index: SOAP-service.tcl
===================================================================
RCS file: /cvsroot/tclsoap/tclsoap/SOAP-service.tcl,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 SOAP-service.tcl
--- SOAP-service.tcl	6 Sep 2003 17:08:46 -0000	1.6
+++ SOAP-service.tcl	1 May 2005 05:25:44 -0000
@@ -26,11 +26,13 @@
 
 package provide SOAP::Service 0.4
 
+if { [catch {package require dom 3.0}] } {
 if { [catch {package require dom 2.0}] } {
     if { [catch {package require dom 1.6}] } {
         error "require dom package greater than 1.6"
     }
 }
+}
 
 if { [catch {package require Trf}] } {
     if { [catch {package require base64}] } {
Index: SOAP.tcl
===================================================================
RCS file: /cvsroot/tclsoap/tclsoap/SOAP.tcl,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 SOAP.tcl
--- SOAP.tcl	6 Sep 2003 17:08:46 -0000	1.48
+++ SOAP.tcl	1 May 2005 05:25:44 -0000
@@ -22,12 +22,14 @@ package require rpcvar;                 
 
 namespace eval ::SOAP {variable domVersion}
 if {[catch {package require SOAP::dom 1.0} ::SOAP::domVersion]} {
+    if { [catch {package require dom 3.0} ::SOAP::domVersion]} {
     if { [catch {package require dom 2.0} ::SOAP::domVersion]} {
         if { [catch {package require dom 1.6} ::SOAP::domVersion]} {
             error "require dom package greater than 1.6"
         }
         package require SOAP::xpath;    # TclSOAP
     }
+    }
     proc ::SOAP::createDocument {name} {
         set doc [dom::DOMImplementation create]
         return [dom::document createElement $doc $name]
Index: xpath.tcl
===================================================================
RCS file: /cvsroot/tclsoap/tclsoap/xpath.tcl,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 xpath.tcl
--- xpath.tcl	6 Sep 2003 17:08:46 -0000	1.9
+++ xpath.tcl	1 May 2005 05:25:44 -0000
@@ -14,11 +14,13 @@
 # for more details.
 # -------------------------------------------------------------------------
 
+if { [catch {package require dom 3.0}] } {
 if { [catch {package require dom 2.0}] } {
     if { [catch {package require dom 1.6}] } {
         error "require dom package greater than 1.6"
     }
 }
+}
 
 namespace eval SOAP::xpath {
     variable version 0.2