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/scopesample/client.rb | 34 -------------------------------- sample/soap/scopesample/httpd.rb | 22 --------------------- sample/soap/scopesample/samplehttpd.conf | 2 -- sample/soap/scopesample/servant.rb | 18 ----------------- sample/soap/scopesample/server.cgi | 29 --------------------------- sample/soap/scopesample/server.rb | 20 ------------------- 6 files changed, 125 deletions(-) delete mode 100644 sample/soap/scopesample/client.rb delete mode 100644 sample/soap/scopesample/httpd.rb delete mode 100644 sample/soap/scopesample/samplehttpd.conf delete mode 100644 sample/soap/scopesample/servant.rb delete mode 100755 sample/soap/scopesample/server.cgi delete mode 100644 sample/soap/scopesample/server.rb (limited to 'sample/soap/scopesample') diff --git a/sample/soap/scopesample/client.rb b/sample/soap/scopesample/client.rb deleted file mode 100644 index 009fdf191..000000000 --- a/sample/soap/scopesample/client.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'soap/rpc/driver' - -server = ARGV.shift || 'http://localhost:7000/' -# server = 'http://localhost:8808/server.cgi' - -# client which accesses application scope servant. -app = SOAP::RPC::Driver.new(server, - 'http://tempuri.org/applicationScopeService') -app.add_method('push', 'value') -app.add_method('pop') - -# client which accesses request scope servant must send SOAPAction to identify -# the service. -req = SOAP::RPC::Driver.new(server, - 'http://tempuri.org/requestScopeService') -req.add_method_with_soapaction('push', - 'http://tempuri.org/requestScopeService', 'value') -req.add_method_with_soapaction('pop', - 'http://tempuri.org/requestScopeService') - -# exec -app.push(1) -app.push(2) -app.push(3) -p app.pop -p app.pop -p app.pop - -req.push(1) -req.push(2) -req.push(3) -p req.pop -p req.pop -p req.pop diff --git a/sample/soap/scopesample/httpd.rb b/sample/soap/scopesample/httpd.rb deleted file mode 100644 index 5f58c7e14..000000000 --- a/sample/soap/scopesample/httpd.rb +++ /dev/null @@ -1,22 +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) do - s.shutdown -end -s.start diff --git a/sample/soap/scopesample/samplehttpd.conf b/sample/soap/scopesample/samplehttpd.conf deleted file mode 100644 index 85e999502..000000000 --- a/sample/soap/scopesample/samplehttpd.conf +++ /dev/null @@ -1,2 +0,0 @@ -docroot = . -port = 8808 diff --git a/sample/soap/scopesample/servant.rb b/sample/soap/scopesample/servant.rb deleted file mode 100644 index 507605007..000000000 --- a/sample/soap/scopesample/servant.rb +++ /dev/null @@ -1,18 +0,0 @@ -class Servant - def self.create - new - end - - def initialize - STDERR.puts "Servant created." - @task = [] - end - - def push(value) - @task.push(value) - end - - def pop - @task.pop - end -end diff --git a/sample/soap/scopesample/server.cgi b/sample/soap/scopesample/server.cgi deleted file mode 100755 index ebe13eb13..000000000 --- a/sample/soap/scopesample/server.cgi +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby - -require 'soap/rpc/cgistub' -require 'servant' - -class Server < SOAP::RPC::CGIStub - class DummyServant - def push(value) - "Not supported" - end - - def pop - "Not supported" - end - end - - def initialize(*arg) - super - add_rpc_servant(Servant.new, 'http://tempuri.org/requestScopeService') - - # Application scope servant is not supported in CGI environment. - # See server.rb to support application scope servant. - dummy = DummyServant.new - add_method_with_namespace('http://tempuri.org/applicationScopeService', dummy, 'push', 'value') - add_method_with_namespace('http://tempuri.org/applicationScopeService', dummy, 'pop') - end -end - -status = Server.new('Server', nil).start diff --git a/sample/soap/scopesample/server.rb b/sample/soap/scopesample/server.rb deleted file mode 100644 index 6b87b74c2..000000000 --- a/sample/soap/scopesample/server.rb +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env ruby - -require 'soap/rpc/standaloneServer' -require 'servant' - -class Server < SOAP::RPC::StandaloneServer - def initialize(*arg) - super - add_rpc_servant(Servant.new, 'http://tempuri.org/applicationScopeService') - add_rpc_request_servant(Servant, 'http://tempuri.org/requestScopeService') - end -end - -if $0 == __FILE__ - server = Server.new('Server', nil, '0.0.0.0', 7000) - trap(:INT) do - server.shutdown - end - server.start -end -- cgit