import SOAP-WSDL 2.00_28 from CPAN

git-cpan-module:   SOAP-WSDL
git-cpan-version:  2.00_28
git-cpan-authorid: MKUTTER
git-cpan-file:     authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00_28.tar.gz

lib/SOAP/WSDL/Generator/Template/XSD.pm

@@ -5,7 +5,7 @@ use Class::Std::Fast::Storable;
 use File::Basename;
 use File::Spec;
 
-our $VERSION = q{2.00_25};
+our $VERSION = q{2.00_27};
 
 use SOAP::WSDL::Generator::Visitor::Typemap;
 use SOAP::WSDL::Generator::Visitor::Typelib;
@@ -57,8 +57,8 @@ sub generate {
 sub generate_typelib {
     my ($self, $arg_ref) = @_;
     # $output_of{ ident $self } = "";
-    my @schema = exists $arg_ref->{ schema } 
-        ? @{ $arg_ref->{schema} } 
+    my @schema = exists $arg_ref->{ schema }
+        ? @{ $arg_ref->{schema} }
         : @{ $self->get_definitions()->first_types()->get_schema() };
     for my $type (map { @{ $_->get_type() } , @{ $_->get_element() } } @schema[1..$#schema] ) {
         $type->_accept( $self );

lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt

@@ -1,4 +1,8 @@
-package [% interface_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]::[% port.get_name.replace('^.+\.','').replace('-', '_') %];
+[% interface_name = interface_prefix _ '::'
+    _ service.get_name.replace('\.', '::') _ '::'
+    _ port.get_name.replace('^.+\.','');
+interface_name = interface_name.replace('-','_'); -%]
+package [% interface_name %];
 use strict;
 use warnings;
 use Class::Std::Fast::Storable;
@@ -33,13 +37,12 @@ __END__
 
 =head1 NAME
 
-
-[% interface_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]::[% port.get_name.replace('\.', '::').replace('-', '_') %] - SOAP Interface for the [% service.get_name %] Web Service
+[% interface_name %] - SOAP Interface for the [% service.get_name %] Web Service
 
 =head1 SYNOPSIS
 
- use [% interface_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]::[% port.get_name.replace('\.', '::').replace('-', '_') %];
- my $interface = [% interface_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]::[% port.get_name.replace('\.', '::').replace('-', '_') %]->new();
+ use [% interface_name %];
+ my $interface = [% interface_name %]->new();
  
  my $response;
 [%      FOREACH operation = binding.get_operation;

lib/SOAP/WSDL/Generator/Template/XSD/Server.tt

@@ -1,4 +1,8 @@
-package [% server_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('^.+\.','') %];
+[% server_name = server_prefix _ '::'
+    _ service.get_name.replace('\.', '::') _ '::'
+    _ port.get_name.replace('^.+\.','');
+server_name = server_name.replace('-','_'); -%]
+package [% server_name %];
 use strict;
 use warnings;
 use Class::Std::Fast::Storable;
@@ -23,7 +27,7 @@ my $action_map_ref = {
 
 sub START {
     my ($self, $ident, $arg_ref) = @_;
-    eval "require $transport_class_of{ $ident }" 
+    eval "require $transport_class_of{ $ident }"
         or die "Cannot load transport class $transport_class_of{ $ident }: $@";
     $transport_of{ $ident } = $transport_class_of{ $ident }->new({
         action_map_ref => $action_map_ref,
@@ -46,12 +50,12 @@ __END__
 
 =head1 NAME
 
-[% interface_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('\.', '::') %] - SOAP Server Class for the [% service.get_name %] Web Service
+[% server_name %] - SOAP Server Class for the [% service.get_name %] Web Service
 
 =head1 SYNOPSIS
 
- use [% server_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('\.', '::') %];
- my $server = [% server_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('\.', '::') %]->new({
+ use [% server_name %];
+ my $server = [% server_name %]->new({
     dispatch_to => 'My::Handler::Class',
     transport_class => 'SOAP::WSDL::Server::CGI',   # optional, default
  });
@@ -79,7 +83,7 @@ located at [% port.first_address.get_location %].
 
 Constructor.
 
-The C<dispatch_to> argument is mandatory. It must be a class or object 
+The C<dispatch_to> argument is mandatory. It must be a class or object
 implementing the SOAP Service methods listed below.
 
 =head2 SOAP Service methods

lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt

@@ -8,8 +8,8 @@ port_op.get_documentation %]
     my ($self, $body, $header) = @_;
     # body is a ??? object - sorry, POD not implemented yet
     # header is a ??? object - sorry, POD not implemented yet
-    
+
     # do something with body and header...
-    
+
     return [% INCLUDE Server/POD/Message.tt %]
  }

lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt

@@ -3,7 +3,7 @@
     #element;
     #STOP;
 -%]
- [% element_prefix %]::[% element.get_name.replace('\.', '::') %]->new([% 
+ [% element_prefix %]::[% element.get_name.replace('\.', '::') %]->new([%
     type = element.first_complexType || element.first_simpleType || definitions.first_types.find_type(
         element.expand( element.get_type ) );
     INCLUDE Interface/POD/Type.tt; %]

lib/SOAP/WSDL/Generator/Visitor.pm

@@ -48,7 +48,7 @@ SOAP::WSDL::Generator::Visitor - SOAP::WSDL's Visitor-based Code Generator
 
 =head1 DESCRIPTION
 
-SOAP::WSDL featores a code generating facility. This code generation facility
+SOAP::WSDL features a code generating facility. This code generation facility
 (in fact there are several of them) is implemented as Visitor to
 SOAP::WSDL::Base-derived objects.
 
@@ -186,8 +186,8 @@ mimicing .NET's .asmx example pages.
 
 =back
 
-All these behaviours could well (and has historically been) implemented in the
-classes holding the WSDL data. This made these classes rather bloated, and
+All these behaviours could well be (and have historically been) implemented in
+the classes holding the WSDL data. This made these classes rather bloated, and
 made it hard to change behaviour (like, supporting SOAP Headers,
 supporting atomic types and other features which were missing from early
 versions of SOAP::WSDL).