From 810a605c34d97fa878cb5b615b9e95a2fee84ca8 Mon Sep 17 00:00:00 2001 From: nahi Date: Sun, 22 May 2005 13:03:38 +0000 Subject: * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4. == SOAP client and server == === for both client side and server side === * improved document/literal service support. style(rpc,document)/use(encoding, literal) combination are all supported. for the detail about combination, see test/soap/test_style.rb. * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to WSDL as well as obj2soap. closes #70. * let SOAP::Mapping::Object handle XML attribute for doc/lit service. you can set/get XML attribute via accessor methods which as a name 'xmlattr_' prefixed ( -> Foo#xmlattr_name). === client side === * WSDLDriver capitalized name operation bug fixed. from 1.5.3-ruby1.8.2, operation which has capitalized name (such as KeywordSearchRequest in AWS) is defined as a method having uncapitalized name. (converted with GenSupport.safemethodname to handle operation name 'foo-bar'). it introduced serious incompatibility; in the past, it was defined as a capitalized. define capitalized method as well under that circumstance. * added new factory interface 'WSDLDriverFactory#create_rpc_driver' to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver are merged). 'WSDLDriverFactory#create_driver' still creates WSDLDriver for compatibility but it warns that the method is deprecated. please use create_rpc_driver instead of create_driver. * allow to use an URI object as an endpoint_url even with net/http, not http-access2. === server side === * added mod_ruby support to SOAP::CGIStub. rename a CGI script server.cgi to server.rb and let mod_ruby's RubyHandler handles the script. CGIStub detects if it's running under mod_ruby environment or not. * added fcgi support to SOAP::CGIStub. see the sample at sample/soap/calc/server.fcgi. (almost same as server.cgi but has fcgi handler at the bottom.) * allow to return a SOAPFault object to respond customized SOAP fault. * added the interface 'generate_explicit_type' for server side (CGIStub, HTTPServer). call 'self.generate_explicit_type = true' if you want to return simplified XML even if it's rpc/encoded service. == WSDL == === WSDL definition === * improved XML Schema support such as extension, restriction, simpleType, complexType + simpleContent, ref, length, import, include. * reduced "unknown element/attribute" warnings (warn only 1 time for each QName). * importing XSD file at schemaLocation with xsd:import. === code generation from WSDL === * generator crashed when there's '-' in defined element/attribute name. * added ApacheMap WSDL definition. * sample/{soap,wsdl}: removed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- sample/soap/sampleStruct/client.rb | 16 ---------------- sample/soap/sampleStruct/httpd.rb | 20 -------------------- sample/soap/sampleStruct/iSampleStruct.rb | 22 ---------------------- sample/soap/sampleStruct/sampleStruct.rb | 13 ------------- sample/soap/sampleStruct/samplehttpd.conf | 2 -- sample/soap/sampleStruct/server.cgi | 14 -------------- sample/soap/sampleStruct/server.rb | 20 -------------------- 7 files changed, 107 deletions(-) delete mode 100644 sample/soap/sampleStruct/client.rb delete mode 100644 sample/soap/sampleStruct/httpd.rb delete mode 100644 sample/soap/sampleStruct/iSampleStruct.rb delete mode 100644 sample/soap/sampleStruct/sampleStruct.rb delete mode 100644 sample/soap/sampleStruct/samplehttpd.conf delete mode 100644 sample/soap/sampleStruct/server.cgi delete mode 100644 sample/soap/sampleStruct/server.rb (limited to 'sample/soap/sampleStruct') diff --git a/sample/soap/sampleStruct/client.rb b/sample/soap/sampleStruct/client.rb deleted file mode 100644 index b55c7fdfc..000000000 --- a/sample/soap/sampleStruct/client.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'soap/rpc/driver' - -require 'iSampleStruct' - -server = ARGV.shift || 'http://localhost:7000/' -# server = 'http://localhost:8808/server.cgi' - -drv = SOAP::RPC::Driver.new(server, SampleStructServiceNamespace) -drv.wiredump_dev = STDERR -drv.add_method('hi', 'sampleStruct') - -o1 = SampleStruct.new -puts "Sending struct: #{ o1.inspect }" -puts -o2 = drv.hi(o1) -puts "Received (wrapped): #{ o2.inspect }" diff --git a/sample/soap/sampleStruct/httpd.rb b/sample/soap/sampleStruct/httpd.rb deleted file mode 100644 index bebcff96c..000000000 --- a/sample/soap/sampleStruct/httpd.rb +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env ruby - -require 'webrick' -require 'soap/property' - -docroot = "." -port = 8808 -if opt = SOAP::Property.loadproperty("samplehttpd.conf") - docroot = opt["docroot"] - port = Integer(opt["port"]) -end - -s = WEBrick::HTTPServer.new( - :BindAddress => "0.0.0.0", - :Port => port, - :DocumentRoot => docroot, - :CGIPathEnv => ENV['PATH'] -) -trap(:INT){ s.shutdown } -s.start diff --git a/sample/soap/sampleStruct/iSampleStruct.rb b/sample/soap/sampleStruct/iSampleStruct.rb deleted file mode 100644 index 399ea52eb..000000000 --- a/sample/soap/sampleStruct/iSampleStruct.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'soap/mapping' - -SampleStructServiceNamespace = 'http://tempuri.org/sampleStructService' - -class SampleStruct; include SOAP::Marshallable - attr_accessor :sampleArray - attr_accessor :date - - def initialize - @sampleArray = SampleArray[ "cyclic", self ] - @date = DateTime.now - end - - def wrap( rhs ) - @sampleArray = SampleArray[ "wrap", rhs.dup ] - @date = DateTime.now - self - end -end - -class SampleArray < Array; include SOAP::Marshallable -end diff --git a/sample/soap/sampleStruct/sampleStruct.rb b/sample/soap/sampleStruct/sampleStruct.rb deleted file mode 100644 index 394c1bff0..000000000 --- a/sample/soap/sampleStruct/sampleStruct.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'iSampleStruct' - -class SampleStructService - def hi(struct) - ack = SampleStruct.new - ack.wrap(struct) - ack - end -end - -if __FILE__ == $0 - p SampleStructService.new.hi(SampleStruct.new) -end diff --git a/sample/soap/sampleStruct/samplehttpd.conf b/sample/soap/sampleStruct/samplehttpd.conf deleted file mode 100644 index 85e999502..000000000 --- a/sample/soap/sampleStruct/samplehttpd.conf +++ /dev/null @@ -1,2 +0,0 @@ -docroot = . -port = 8808 diff --git a/sample/soap/sampleStruct/server.cgi b/sample/soap/sampleStruct/server.cgi deleted file mode 100644 index 42751386a..000000000 --- a/sample/soap/sampleStruct/server.cgi +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/local/bin/ruby - -require 'soap/rpc/cgistub' -require 'sampleStruct' - -class SampleStructServer < SOAP::RPC::CGIStub - def initialize(*arg) - super - servant = SampleStructService.new - add_servant(servant) - end -end - -status = SampleStructServer.new('SampleStructServer', SampleStructServiceNamespace).start diff --git a/sample/soap/sampleStruct/server.rb b/sample/soap/sampleStruct/server.rb deleted file mode 100644 index ea1a2ef1d..000000000 --- a/sample/soap/sampleStruct/server.rb +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env ruby - -require 'soap/rpc/standaloneServer' -require 'sampleStruct' - -class SampleStructServer < SOAP::RPC::StandaloneServer - def initialize(*arg) - super - servant = SampleStructService.new - add_servant(servant) - end -end - -if $0 == __FILE__ - server = SampleStructServer.new('SampleStructServer', SampleStructServiceNamespace, '0.0.0.0', 7000) - trap(:INT) do - server.shutdown - end - server.start -end -- cgit