Welcome to the "trac"-ing site of soap4r!
[soap4r] [httpclient] [openpgp4u] [pkcs1] [logger] [csv] [vtr]

Changeset 1652

Show
Ignore:
Timestamp:
10/22/05 00:36:57 (3 years ago)
Author:
nahi
Message:

added soapenc types to TypeMap?. soap4r does not use soapenc types actively (uses xsd types instead) but it should be accepted. closes #170.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/soap/baseData.rb

    r1650 r1652  
    223223  include SOAPBasetype 
    224224  extend SOAPModuleUtils 
     225  SOAPENCType = QName.new(EncodingNamespace, StringLiteral) 
    225226end 
    226227 
    …… 
    228229  include SOAPBasetype 
    229230  extend SOAPModuleUtils 
     231  SOAPENCType = QName.new(EncodingNamespace, BooleanLiteral) 
    230232end 
    231233 
    …… 
    233235  include SOAPBasetype 
    234236  extend SOAPModuleUtils 
     237  SOAPENCType = QName.new(EncodingNamespace, DecimalLiteral) 
    235238end 
    236239 
    …… 
    238241  include SOAPBasetype 
    239242  extend SOAPModuleUtils 
     243  SOAPENCType = QName.new(EncodingNamespace, FloatLiteral) 
    240244end 
    241245 
    …… 
    243247  include SOAPBasetype 
    244248  extend SOAPModuleUtils 
     249  SOAPENCType = QName.new(EncodingNamespace, DoubleLiteral) 
    245250end 
    246251 
    …… 
    248253  include SOAPBasetype 
    249254  extend SOAPModuleUtils 
     255  SOAPENCType = QName.new(EncodingNamespace, DurationLiteral) 
    250256end 
    251257 
    …… 
    253259  include SOAPBasetype 
    254260  extend SOAPModuleUtils 
     261  SOAPENCType = QName.new(EncodingNamespace, DateTimeLiteral) 
    255262end 
    256263 
    …… 
    258265  include SOAPBasetype 
    259266  extend SOAPModuleUtils 
     267  SOAPENCType = QName.new(EncodingNamespace, TimeLiteral) 
    260268end 
    261269 
    …… 
    263271  include SOAPBasetype 
    264272  extend SOAPModuleUtils 
     273  SOAPENCType = QName.new(EncodingNamespace, DateLiteral) 
    265274end 
    266275 
    …… 
    268277  include SOAPBasetype 
    269278  extend SOAPModuleUtils 
     279  SOAPENCType = QName.new(EncodingNamespace, GYearMonthLiteral) 
    270280end 
    271281 
    …… 
    273283  include SOAPBasetype 
    274284  extend SOAPModuleUtils 
     285  SOAPENCType = QName.new(EncodingNamespace, GYearLiteral) 
    275286end 
    276287 
    …… 
    278289  include SOAPBasetype 
    279290  extend SOAPModuleUtils 
     291  SOAPENCType = QName.new(EncodingNamespace, GMonthDayLiteral) 
    280292end 
    281293 
    …… 
    283295  include SOAPBasetype 
    284296  extend SOAPModuleUtils 
     297  SOAPENCType = QName.new(EncodingNamespace, GDayLiteral) 
    285298end 
    286299 
    …… 
    288301  include SOAPBasetype 
    289302  extend SOAPModuleUtils 
     303  SOAPENCType = QName.new(EncodingNamespace, GMonthLiteral) 
    290304end 
    291305 
    …… 
    293307  include SOAPBasetype 
    294308  extend SOAPModuleUtils 
     309  SOAPENCType = QName.new(EncodingNamespace, HexBinaryLiteral) 
    295310end 
    296311 
    …… 
    298313  include SOAPBasetype 
    299314  extend SOAPModuleUtils 
    300   Type = QName.new(EncodingNamespace, Base64Literal) 
     315  Type = SOAPENCType = QName.new(EncodingNamespace, Base64Literal) 
    301316 
    302317public 
    …… 
    315330  include SOAPBasetype 
    316331  extend SOAPModuleUtils 
     332  SOAPENCType = QName.new(EncodingNamespace, AnyURILiteral) 
    317333end 
    318334 
    …… 
    320336  include SOAPBasetype 
    321337  extend SOAPModuleUtils 
     338  SOAPENCType = QName.new(EncodingNamespace, QNameLiteral) 
    322339end 
    323340 
    …… 
    326343  include SOAPBasetype 
    327344  extend SOAPModuleUtils 
     345  SOAPENCType = QName.new(EncodingNamespace, IntegerLiteral) 
    328346end 
    329347 
    …… 
    331349  include SOAPBasetype 
    332350  extend SOAPModuleUtils 
     351  SOAPENCType = QName.new(EncodingNamespace, NonPositiveIntegerLiteral) 
    333352end 
    334353 
    …… 
    336355  include SOAPBasetype 
    337356  extend SOAPModuleUtils 
     357  SOAPENCType = QName.new(EncodingNamespace, NegativeIntegerLiteral) 
    338358end 
    339359 
    …… 
    341361  include SOAPBasetype 
    342362  extend SOAPModuleUtils 
     363  SOAPENCType = QName.new(EncodingNamespace, LongLiteral) 
    343364end 
    344365 
    …… 
    346367  include SOAPBasetype 
    347368  extend SOAPModuleUtils 
     369  SOAPENCType = QName.new(EncodingNamespace, IntLiteral) 
    348370end 
    349371 
    …… 
    351373  include SOAPBasetype 
    352374  extend SOAPModuleUtils 
     375  SOAPENCType = QName.new(EncodingNamespace, ShortLiteral) 
    353376end 
    354377 
    …… 
    356379  include SOAPBasetype 
    357380  extend SOAPModuleUtils 
     381  SOAPENCType = QName.new(EncodingNamespace, ByteLiteral) 
    358382end 
    359383 
    …… 
    361385  include SOAPBasetype 
    362386  extend SOAPModuleUtils 
     387  SOAPENCType = QName.new(EncodingNamespace, NonNegativeIntegerLiteral) 
    363388end 
    364389 
    …… 
    366391  include SOAPBasetype 
    367392  extend SOAPModuleUtils 
     393  SOAPENCType = QName.new(EncodingNamespace, UnsignedLongLiteral) 
    368394end 
    369395 
    …… 
    371397  include SOAPBasetype 
    372398  extend SOAPModuleUtils 
     399  SOAPENCType = QName.new(EncodingNamespace, UnsignedIntLiteral) 
    373400end 
    374401 
    …… 
    376403  include SOAPBasetype 
    377404  extend SOAPModuleUtils 
     405  SOAPENCType = QName.new(EncodingNamespace, UnsignedShortLiteral) 
    378406end 
    379407 
    …… 
    381409  include SOAPBasetype 
    382410  extend SOAPModuleUtils 
     411  SOAPENCType = QName.new(EncodingNamespace, UnsignedByteLiteral) 
    383412end 
    384413 
    …… 
    386415  include SOAPBasetype 
    387416  extend SOAPModuleUtils 
     417  SOAPENCType = QName.new(EncodingNamespace, PositiveIntegerLiteral) 
    388418end 
    389419 

  • trunk/lib/soap/encodingstyle/soapHandler.rb

    r1603 r1652  
    439439    end 
    440440 
    441     if (klass = TypeMap[type]) 
     441    if klass = TypeMap[type] 
    442442      node = decode_basetype(klass, elename) 
    443443      node.extraattr.update(extraattr) 

  • trunk/lib/soap/mapping/typeMap.rb

    r1520 r1652  
    1212TypeMap = { 
    1313  XSD::XSDAnySimpleType::Type => SOAPAnySimpleType, 
     14 
    1415  XSD::XSDString::Type => SOAPString, 
    1516  XSD::XSDBoolean::Type => SOAPBoolean, 
    …… 
    4445  XSD::XSDPositiveInteger::Type => SOAPPositiveInteger, 
    4546 
    46   SOAP::SOAPBase64::Type => SOAPBase64, 
     47  # soap4r does not use soapenc types actively but it should be accepted. 
     48  SOAP::SOAPString::SOAPENCType => SOAPString, 
     49  SOAP::SOAPBoolean::SOAPENCType => SOAPBoolean, 
     50  SOAP::SOAPDecimal::SOAPENCType => SOAPDecimal, 
     51  SOAP::SOAPFloat::SOAPENCType => SOAPFloat, 
     52  SOAP::SOAPDouble::SOAPENCType => SOAPDouble, 
     53  SOAP::SOAPDuration::SOAPENCType => SOAPDuration, 
     54  SOAP::SOAPDateTime::SOAPENCType => SOAPDateTime, 
     55  SOAP::SOAPTime::SOAPENCType => SOAPTime, 
     56  SOAP::SOAPDate::SOAPENCType => SOAPDate, 
     57  SOAP::SOAPGYearMonth::SOAPENCType => SOAPGYearMonth, 
     58  SOAP::SOAPGYear::SOAPENCType => SOAPGYear, 
     59  SOAP::SOAPGMonthDay::SOAPENCType => SOAPGMonthDay, 
     60  SOAP::SOAPGDay::SOAPENCType => SOAPGDay, 
     61  SOAP::SOAPGMonth::SOAPENCType => SOAPGMonth, 
     62  SOAP::SOAPHexBinary::SOAPENCType => SOAPHexBinary, 
     63  SOAP::SOAPBase64::SOAPENCType => SOAPBase64, 
     64  SOAP::SOAPAnyURI::SOAPENCType => SOAPAnyURI, 
     65  SOAP::SOAPQName::SOAPENCType => SOAPQName, 
     66  SOAP::SOAPInteger::SOAPENCType => SOAPInteger, 
     67  SOAP::SOAPNonPositiveInteger::SOAPENCType => SOAPNonPositiveInteger, 
     68  SOAP::SOAPNegativeInteger::SOAPENCType => SOAPNegativeInteger, 
     69  SOAP::SOAPLong::SOAPENCType => SOAPLong, 
     70  SOAP::SOAPInt::SOAPENCType => SOAPInt, 
     71  SOAP::SOAPShort::SOAPENCType => SOAPShort, 
     72  SOAP::SOAPByte::SOAPENCType => SOAPByte, 
     73  SOAP::SOAPNonNegativeInteger::SOAPENCType => SOAPNonNegativeInteger, 
     74  SOAP::SOAPUnsignedLong::SOAPENCType => SOAPUnsignedLong, 
     75  SOAP::SOAPUnsignedInt::SOAPENCType => SOAPUnsignedInt, 
     76  SOAP::SOAPUnsignedShort::SOAPENCType => SOAPUnsignedShort, 
     77  SOAP::SOAPUnsignedByte::SOAPENCType => SOAPUnsignedByte, 
     78  SOAP::SOAPPositiveInteger::SOAPENCType => SOAPPositiveInteger, 
    4779} 
    4880 

  • trunk/lib/soap/mapping/wsdlencodedregistry.rb

    r1638 r1652  
    8686    elsif obj.is_a?(XSD::NSDBase) 
    8787      soap2soap(obj, qname) 
    88     elsif (type = TypeMap[qname]) 
     88    elsif type = TypeMap[qname] 
    8989      base2soap(obj, type) 
    9090    else