Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added check (for nested namespace prefix case), that a namespace prefix is not reused for another URI. See Ticket [dcce437d7a] |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
fb182ca3fc147bf0774dfb05eb2b1f50 |
User & Date: | oehhar 2017-11-06 08:20:48.653 |
References
2017-11-06 08:24 | • Ticket [dcce437d7a] Allow inline namespaces in WSDL status still Closed with 1 other change artifact: b96ece5613 user: oehhar | |
Context
2017-11-14 10:14 | Reworked the webservice call option list documentation (so I understand it better) check-in: 63108ec92f user: oehhar tags: trunk | |
2017-11-06 08:20 | Added check (for nested namespace prefix case), that a namespace prefix is not reused for another URI. See Ticket [dcce437d7a] check-in: fb182ca3fc user: oehhar tags: trunk | |
2017-11-03 16:00 | Search namespace prefix also in element nodes and not only in definition node of wsdl file. Patch by by Wolfgang Winkler. Ticket [dcce437d7a] check-in: 1915e65746 user: oehhar tags: trunk | |
Changes
Changes to ClientSide.tcl.
︙ | ︙ | |||
985 986 987 988 989 990 991 | # Maintenance History - as this file is modified, please be sure that you # update this segment of the file header block by # adding a complete entry at the bottom of the list. # # Version Date Programmer Comments / Changes / Reasons # ------- ---------- ---------- ------------------------------------------- # 1 07/06/2006 G.Lester Initial version | | > > > | 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 | # Maintenance History - as this file is modified, please be sure that you # update this segment of the file header block by # adding a complete entry at the bottom of the list. # # Version Date Programmer Comments / Changes / Reasons # ------- ---------- ---------- ------------------------------------------- # 1 07/06/2006 G.Lester Initial version # 2.4.4 2017-11-03 H.Oehlmann Included ticket [dcce437d7a] with # solution by Wolfgang Winkler: # Search namespace prfix also in element # nodes and not only in definition node # of wsdl file. # 2.4.4 2017-11-06 H.Oehlmann Added check (for nested namespace prefix # case), that a namespace prefix is not # reused for another URI. # # ########################################################################### proc ::WS::Client::ParseWsdl {wsdlXML args} { variable currentBaseUrl variable serviceArr |
︙ | ︙ | |||
1039 1040 1041 1042 1043 1044 1045 | # not to clash with the wsdl prefix in <ns> # Predefined: # - tns1 : targetNamespace # - w: http://schemas.xmlsoap.org/wsdl/ # - d: http://schemas.xmlsoap.org/wsdl/soap/ # - xs: http://www.w3.org/2001/XMLSchema # | | > | > | 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 | # not to clash with the wsdl prefix in <ns> # Predefined: # - tns1 : targetNamespace # - w: http://schemas.xmlsoap.org/wsdl/ # - d: http://schemas.xmlsoap.org/wsdl/soap/ # - xs: http://www.w3.org/2001/XMLSchema # # The top node # <wsdl:definitions # targetNamespace="http://www.webserviceX.NET/"> # xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/ ...> # contains the target namespace and all namespace definitions dict set nsDict url $targetNs tns$nsCount $wsdlDoc selectNodesNamespaces { w http://schemas.xmlsoap.org/wsdl/ d http://schemas.xmlsoap.org/wsdl/soap/ xs http://www.w3.org/2001/XMLSchema } ## ## loop over the top definitions node and all elements nodes ## # Element nodes may declare namespaces inline like: # <xs:element xmlns:q1="myURI" type="q1:MessageQ1"/> # ticket [dcce437d7a] foreach elemNode [linsert [$wsdlDoc selectNodes {//xs:element}] 0 $wsdlNode] { # Get list of xmlns attributes # This list looks for the example like: {{q1 q1 {}} ... } set xmlnsAttributes [$elemNode attributes xmlns:*] # Loop over found namespaces foreach itemList $xmlnsAttributes { set ns [lindex $itemList 0] set url [$elemNode getAttribute xmlns:$ns] if {[dict exists $nsDict url $url]} { set tns [dict get $nsDict url $url] } else { ## ## Check for hardcoded namespaces ## switch -exact -- $url { |
︙ | ︙ | |||
1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 | } default { set tns tns[incr nsCount] } } dict set nsDict url $url $tns } dict set nsDict tns $ns $tns } } if {[info exists currentBaseUrl]} { set url $currentBaseUrl } else { | > > > > > > > > > > > > > > > > | 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 | } default { set tns tns[incr nsCount] } } dict set nsDict url $url $tns } ## ## Check if same namespace prefix was already assigned to a ## different URL ## # This may happen, if the element namespace prefix overwrites # a global one, like # <wsdl:definitions xmlns:q1="URI1" ...> # <xs:element xmlns:q1="URI2" type="q1:MessageQ1"/> if { [dict exists $nsDict tns $ns] && $tns ne [dict get $nsDict tns $ns] } { ::log::log debug "Namespace prefix '$ns' with different URI '$url': $nsDict" return \ -code error \ -errorcode [list WS CLIENT AMBIGNSPREFIX] \ "element namespace prefix '$ns' used again for different URI '$url'.\ Sorry, this is a current implementation limitation of TCLWS." } dict set nsDict tns $ns $tns } } if {[info exists currentBaseUrl]} { set url $currentBaseUrl } else { |
︙ | ︙ | |||
2024 2025 2026 2027 2028 2029 2030 | # Possibility (2) "OutName" WSDL example: # <wsdl:portType...><wsdl:operation...> # <wsdl:output name="{OutName}" message="tns:{OutMsgName}" /> # This possibility is requested by ticket [21f41e22bc] # # Possibility (3) default name "{OperationName}Result" WSDL example: # <wsdl:portType...><wsdl:operation name="{OperationName}"> | | | 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 | # Possibility (2) "OutName" WSDL example: # <wsdl:portType...><wsdl:operation...> # <wsdl:output name="{OutName}" message="tns:{OutMsgName}" /> # This possibility is requested by ticket [21f41e22bc] # # Possibility (3) default name "{OperationName}Result" WSDL example: # <wsdl:portType...><wsdl:operation name="{OperationName}"> # <wsdl:output message="tns:{OutMsgName}" -> *** no name tag *** # # Possibility (4) was not found in wsdl 1.0 standard but was used as only # solution by TCLWS prior to 2.4.2. # The following sketch shows the location of the local output type name # "OutTypeName" in a WSDL file: # -> In WSDL portType output message name # <wsdl:portType...><wsdl:operation...> |
︙ | ︙ |