summaryrefslogtreecommitdiffstats
path: root/sample/soap/calc
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-22 13:03:38 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-22 13:03:38 +0000
commit810a605c34d97fa878cb5b615b9e95a2fee84ca8 (patch)
treec17440206af25b52f47b1c391f818e126a994d0a /sample/soap/calc
parent11491c909c15feef7731483824ab29ce1d434739 (diff)
downloadruby-810a605c34d97fa878cb5b615b9e95a2fee84ca8.tar.gz
ruby-810a605c34d97fa878cb5b615b9e95a2fee84ca8.tar.xz
ruby-810a605c34d97fa878cb5b615b9e95a2fee84ca8.zip
* 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 name="bar"/> -> 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
Diffstat (limited to 'sample/soap/calc')
-rw-r--r--sample/soap/calc/calc.rb17
-rw-r--r--sample/soap/calc/calc2.rb29
-rw-r--r--sample/soap/calc/client.rb26
-rw-r--r--sample/soap/calc/client2.rb29
-rw-r--r--sample/soap/calc/httpd.rb20
-rw-r--r--sample/soap/calc/samplehttpd.conf2
-rw-r--r--sample/soap/calc/server.cgi15
-rw-r--r--sample/soap/calc/server.rb21
-rw-r--r--sample/soap/calc/server2.rb24
9 files changed, 0 insertions, 183 deletions
diff --git a/sample/soap/calc/calc.rb b/sample/soap/calc/calc.rb
deleted file mode 100644
index 6bc78803b..000000000
--- a/sample/soap/calc/calc.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module CalcService
- def self.add(lhs, rhs)
- lhs + rhs
- end
-
- def self.sub(lhs, rhs)
- lhs - rhs
- end
-
- def self.multi(lhs, rhs)
- lhs * rhs
- end
-
- def self.div(lhs, rhs)
- lhs / rhs
- end
-end
diff --git a/sample/soap/calc/calc2.rb b/sample/soap/calc/calc2.rb
deleted file mode 100644
index e9cf6bbca..000000000
--- a/sample/soap/calc/calc2.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class CalcService2
- def initialize(value = 0)
- @value = value
- end
-
- def set(value)
- @value = value
- end
-
- def get
- @value
- end
-
- def +(rhs)
- @value + rhs
- end
-
- def -(rhs)
- @value - rhs
- end
-
- def *(rhs)
- @value * rhs
- end
-
- def /(rhs)
- @value / rhs
- end
-end
diff --git a/sample/soap/calc/client.rb b/sample/soap/calc/client.rb
deleted file mode 100644
index 57a4c0ba5..000000000
--- a/sample/soap/calc/client.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'soap/rpc/driver'
-
-server = ARGV.shift || 'http://localhost:7000/'
-# server = 'http://localhost:8808/server.cgi'
-
-calc = SOAP::RPC::Driver.new(server, 'http://tempuri.org/calcService')
-#calc.wiredump_dev = STDERR
-calc.add_method('add', 'lhs', 'rhs')
-calc.add_method('sub', 'lhs', 'rhs')
-calc.add_method('multi', 'lhs', 'rhs')
-calc.add_method('div', 'lhs', 'rhs')
-
-puts 'add: 1 + 2 # => 3'
-puts calc.add(1, 2)
-puts 'sub: 1.1 - 2.2 # => -1.1'
-puts calc.sub(1.1, 2.2)
-puts 'multi: 1.1 * 2.2 # => 2.42'
-puts calc.multi(1.1, 2.2)
-puts 'div: 5 / 2 # => 2'
-puts calc.div(5, 2)
-puts 'div: 5.0 / 2 # => 2.5'
-puts calc.div(5.0, 2)
-puts 'div: 1.1 / 0 # => Infinity'
-puts calc.div(1.1, 0)
-puts 'div: 1 / 0 # => ZeroDivisionError'
-puts calc.div(1, 0)
diff --git a/sample/soap/calc/client2.rb b/sample/soap/calc/client2.rb
deleted file mode 100644
index 2c53f09d4..000000000
--- a/sample/soap/calc/client2.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'soap/rpc/driver'
-
-server = ARGV.shift || 'http://localhost:7000/'
-# server = 'http://localhost:8808/server2.cgi'
-
-var = SOAP::RPC::Driver.new( server, 'http://tempuri.org/calcService' )
-var.add_method( 'set', 'newValue' )
-var.add_method( 'get' )
-var.add_method_as( '+', 'add', 'rhs' )
-var.add_method_as( '-', 'sub', 'rhs' )
-var.add_method_as( '*', 'multi', 'rhs' )
-var.add_method_as( '/', 'div', 'rhs' )
-
-puts 'var.set( 1 )'
-puts '# Bare in mind that another client set another value to this service.'
-puts '# This is only a sample for proof of concept.'
-var.set( 1 )
-puts 'var + 2 # => 1 + 2 = 3'
-puts var + 2
-puts 'var - 2.2 # => 1 - 2.2 = -1.2'
-puts var - 2.2
-puts 'var * 2.2 # => 1 * 2.2 = 2.2'
-puts var * 2.2
-puts 'var / 2 # => 1 / 2 = 0'
-puts var / 2
-puts 'var / 2.0 # => 1 / 2.0 = 0.5'
-puts var / 2.0
-puts 'var / 0 # => 1 / 0 => ZeroDivisionError'
-puts var / 0
diff --git a/sample/soap/calc/httpd.rb b/sample/soap/calc/httpd.rb
deleted file mode 100644
index bebcff96c..000000000
--- a/sample/soap/calc/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/calc/samplehttpd.conf b/sample/soap/calc/samplehttpd.conf
deleted file mode 100644
index 85e999502..000000000
--- a/sample/soap/calc/samplehttpd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-docroot = .
-port = 8808
diff --git a/sample/soap/calc/server.cgi b/sample/soap/calc/server.cgi
deleted file mode 100644
index c4fa68755..000000000
--- a/sample/soap/calc/server.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'soap/rpc/cgistub'
-
-class CalcServer < SOAP::RPC::CGIStub
- def initialize(*arg)
- super
-
- require 'calc'
- servant = CalcService
- add_servant(servant, 'http://tempuri.org/calcService')
- end
-end
-
-status = CalcServer.new('CalcServer', nil).start
diff --git a/sample/soap/calc/server.rb b/sample/soap/calc/server.rb
deleted file mode 100644
index 97661be9d..000000000
--- a/sample/soap/calc/server.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'soap/rpc/standaloneServer'
-require 'calc'
-
-class CalcServer < SOAP::RPC::StandaloneServer
- def initialize(*arg)
- super
-
- servant = CalcService
- add_servant(servant, 'http://tempuri.org/calcService')
- end
-end
-
-if $0 == __FILE__
- server = CalcServer.new('CalcServer', nil, '0.0.0.0', 7000)
- trap(:INT) do
- server.shutdown
- end
- server.start
-end
diff --git a/sample/soap/calc/server2.rb b/sample/soap/calc/server2.rb
deleted file mode 100644
index bb0f643d7..000000000
--- a/sample/soap/calc/server2.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'soap/rpc/standaloneServer'
-require 'calc2'
-
-class CalcServer2 < SOAP::RPC::StandaloneServer
- def on_init
- servant = CalcService2.new
- add_method(servant, 'set', 'newValue')
- add_method(servant, 'get')
- add_method_as(servant, '+', 'add', 'lhs')
- add_method_as(servant, '-', 'sub', 'lhs')
- add_method_as(servant, '*', 'multi', 'lhs')
- add_method_as(servant, '/', 'div', 'lhs')
- end
-end
-
-if $0 == __FILE__
- server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 7000)
- trap(:INT) do
- server.shutdown
- end
- status = server.start
-end