* sample/soap/calc/httpd.rb, sample/soap/exchange/httpd.rb,

          sample/soap/sampleStruct/httpd.rb, sample/wsdl/googleSearch/httpd.rb:
          use soap/property instead of getopts for configuring DocumentRoot
          and port# of httpd.  see samplehttpd.conf below.

        * sample/soap/calc/samplehttpd.conf,
          sample/soap/exchange/samplehttpd.conf,
          sample/soap/sampleStruct/samplehttpd.conf,
          sample/wsdl/googleSearch/samplehttpd.conf: added.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 60 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d93a4183..64e1f8d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sun Feb 15 20:41:15 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* sample/soap/calc/httpd.rb, sample/soap/exchange/httpd.rb,
+	  sample/soap/sampleStruct/httpd.rb, sample/wsdl/googleSearch/httpd.rb:
+	  use soap/property instead of getopts for configuring DocumentRoot
+	  and port# of httpd.  see samplehttpd.conf below.
+
+	* sample/soap/calc/samplehttpd.conf,
+	  sample/soap/exchange/samplehttpd.conf,
+	  sample/soap/sampleStruct/samplehttpd.conf,
+	  sample/wsdl/googleSearch/samplehttpd.conf: added.
+
 Sun Feb 15 19:13:33 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/tuplespace.rb: read(tpl,0), raise RequestExpiredError
diff --git a/MANIFEST b/MANIFEST
index 29c8006f1..cdf525b1e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -693,6 +693,7 @@ sample/soap/calc/calc2.rb
 sample/soap/calc/client.rb
 sample/soap/calc/client2.rb
 sample/soap/calc/httpd.rb
+sample/soap/calc/samplehttpd.conf
 sample/soap/calc/server.cgi
 sample/soap/calc/server.rb
 sample/soap/calc/server2.rb
@@ -700,6 +701,7 @@ sample/soap/digraph.rb
 sample/soap/exchange/client.rb
 sample/soap/exchange/exchange.rb
 sample/soap/exchange/httpd.rb
+sample/soap/exchange/samplehttpd.conf
 sample/soap/exchange/server.cgi
 sample/soap/exchange/server.rb
 sample/soap/helloworld/hw_c.rb
@@ -713,6 +715,7 @@ sample/rss/rss_recent.rb
 sample/rss/tdiary_plugin/rss-recent.rb
 sample/soap/sampleStruct/client.rb
 sample/soap/sampleStruct/httpd.rb
+sample/soap/sampleStruct/samplehttpd.conf
 sample/soap/sampleStruct/iSampleStruct.rb
 sample/soap/sampleStruct/sampleStruct.rb
 sample/soap/sampleStruct/server.cgi
@@ -744,6 +747,7 @@ sample/wsdl/googleSearch/GoogleSearch.rb
 sample/wsdl/googleSearch/GoogleSearchDriver.rb
 sample/wsdl/googleSearch/README
 sample/wsdl/googleSearch/httpd.rb
+sample/wsdl/googleSearch/samplehttpd.conf
 sample/wsdl/googleSearch/sampleClient.rb
 sample/wsdl/googleSearch/sjissearch.sh
 sample/wsdl/googleSearch/wsdlDriver.rb
diff --git a/sample/soap/calc/httpd.rb b/sample/soap/calc/httpd.rb
index ee8ab09f5..bebcff96c 100644
--- a/sample/soap/calc/httpd.rb
+++ b/sample/soap/calc/httpd.rb
@@ -1,14 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'webrick'
-require 'getopts'
+require 'soap/property'
 
-getopts "", 'r:', 'p:8808'
+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 => $OPT_p.to_i,
-  :DocumentRoot => $OPT_r || ".",
+  :Port => port,
+  :DocumentRoot => docroot,
   :CGIPathEnv => ENV['PATH']
 )
 trap(:INT){ s.shutdown }
diff --git a/sample/soap/calc/samplehttpd.conf b/sample/soap/calc/samplehttpd.conf
new file mode 100644
index 000000000..85e999502
--- /dev/null
+++ b/sample/soap/calc/samplehttpd.conf
@@ -0,0 +1,2 @@
+docroot = .
+port = 8808
diff --git a/sample/soap/exchange/httpd.rb b/sample/soap/exchange/httpd.rb
index ee8ab09f5..bebcff96c 100644
--- a/sample/soap/exchange/httpd.rb
+++ b/sample/soap/exchange/httpd.rb
@@ -1,14 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'webrick'
-require 'getopts'
+require 'soap/property'
 
-getopts "", 'r:', 'p:8808'
+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 => $OPT_p.to_i,
-  :DocumentRoot => $OPT_r || ".",
+  :Port => port,
+  :DocumentRoot => docroot,
   :CGIPathEnv => ENV['PATH']
 )
 trap(:INT){ s.shutdown }
diff --git a/sample/soap/exchange/samplehttpd.conf b/sample/soap/exchange/samplehttpd.conf
new file mode 100644
index 000000000..85e999502
--- /dev/null
+++ b/sample/soap/exchange/samplehttpd.conf
@@ -0,0 +1,2 @@
+docroot = .
+port = 8808
diff --git a/sample/soap/sampleStruct/httpd.rb b/sample/soap/sampleStruct/httpd.rb
index ee8ab09f5..bebcff96c 100644
--- a/sample/soap/sampleStruct/httpd.rb
+++ b/sample/soap/sampleStruct/httpd.rb
@@ -1,14 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'webrick'
-require 'getopts'
+require 'soap/property'
 
-getopts "", 'r:', 'p:8808'
+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 => $OPT_p.to_i,
-  :DocumentRoot => $OPT_r || ".",
+  :Port => port,
+  :DocumentRoot => docroot,
   :CGIPathEnv => ENV['PATH']
 )
 trap(:INT){ s.shutdown }
diff --git a/sample/soap/sampleStruct/samplehttpd.conf b/sample/soap/sampleStruct/samplehttpd.conf
new file mode 100644
index 000000000..85e999502
--- /dev/null
+++ b/sample/soap/sampleStruct/samplehttpd.conf
@@ -0,0 +1,2 @@
+docroot = .
+port = 8808
diff --git a/sample/wsdl/googleSearch/httpd.rb b/sample/wsdl/googleSearch/httpd.rb
index ee8ab09f5..bebcff96c 100644
--- a/sample/wsdl/googleSearch/httpd.rb
+++ b/sample/wsdl/googleSearch/httpd.rb
@@ -1,14 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'webrick'
-require 'getopts'
+require 'soap/property'
 
-getopts "", 'r:', 'p:8808'
+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 => $OPT_p.to_i,
-  :DocumentRoot => $OPT_r || ".",
+  :Port => port,
+  :DocumentRoot => docroot,
   :CGIPathEnv => ENV['PATH']
 )
 trap(:INT){ s.shutdown }
diff --git a/sample/wsdl/googleSearch/samplehttpd.conf b/sample/wsdl/googleSearch/samplehttpd.conf
new file mode 100644
index 000000000..85e999502
--- /dev/null
+++ b/sample/wsdl/googleSearch/samplehttpd.conf
@@ -0,0 +1,2 @@
+docroot = .
+port = 8808