Changeset 1928

Timestamp:

08/29/07 23:14:12 (1 year ago)

Author:

nahi

Message:

• added servletStubCreator. wsdl2ruby.rb with --servlet_stub creates servlet stub for WEBrick. closes #290.
  

Files:

• trunk/bin/wsdl2ruby.rb (modified) (3 diffs)
• trunk/lib/wsdl/soap/servletStubCreator.rb (added)
• trunk/lib/wsdl/soap/wsdl2ruby.rb (modified) (3 diffs)
• trunk/lib/xsd/codegen/moduledef.rb (modified) (1 diff)

trunk/bin/wsdl2ruby.rb

@@ -18 +18 @@
-    ['--servant_skelton','-s', GetoptLong::OPTIONAL_ARGUMENT],
-    ['--cgi_stub','-g', GetoptLong::OPTIONAL_ARGUMENT],
+    ['--servlet_stub','-l', GetoptLong::OPTIONAL_ARGUMENT],
-    ['--standalone_server_stub','-a', GetoptLong::OPTIONAL_ARGUMENT],
-    ['--driver','-d', GetoptLong::OPTIONAL_ARGUMENT],
@@ -70 +71 @@
-  --servant_skelton [porttypename]
-  --cgi_stub [servicename]
+  --servlet_stub [servicename]
-  --standalone_server_stub [servicename]
-  --driver [porttypename]
@@ -113 +115 @@
-        when "--classdef", "--mapping_registry",
-            "--client_skelton", "--servant_skelton",
-
+ervlet_stub", "--s
-            "--driver"
-          opt[name.sub(/^--/, '')] = arg.empty? ? nil : arg

trunk/lib/wsdl/soap/wsdl2ruby.rb

@@ -15 +15 @@
-require 'wsdl/soap/clientSkeltonCreator'
-require 'wsdl/soap/standaloneServerStubCreator'
+require 'wsdl/soap/servletStubCreator'
-require 'wsdl/soap/cgiStubCreator'
-
@@ -62 +63 @@
-    create_cgi_stub(@opt['cgi_stub']) if @opt.key?('cgi_stub')
-    create_standalone_server_stub(@opt['standalone_server_stub']) if @opt.key?('standalone_server_stub')
+    create_servlet_stub(@opt['servlet_stub']) if @opt.key?('servlet_stub')
-    create_driver(@opt['driver'], @opt['drivername_postfix'] || '') if @opt.key?('driver')
-    create_client_skelton(@opt['client_skelton']) if @opt.key?('client_skelton')
@@ -133 +135 @@
-      f << "require '#{@mr_filename}'\n" if @mr_filename
-      f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl, @modulepath).dump(
+        create_name(servicename))
+    end
+  end
+
+  def create_servlet_stub(servicename)
+    @logger.info { "Creating servlet stub." }
+    servicename ||= @wsdl.services[0].name.name
+    @servlet_stub_filename = servicename + 'Servlet.rb'
+    check_file(@servlet_stub_filename) or return
+    write_file(@servlet_stub_filename) do |f|
+      f << shbang << "\n"
+      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f << WSDL::SOAP::ServletStubCreator.new(@wsdl, @modulepath).dump(
-        create_name(servicename))
-    end

trunk/lib/xsd/codegen/moduledef.rb

@@ -20 +20 @@
-  include CommentDef
-
+  attr_reader :name
-  attr_reader :innermodule
-