import SOAP-WSDL 2.00_05 from CPAN

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

lib/SOAP/WSDL/XSD/Element.pm

@@ -153,6 +153,7 @@ sub to_typemap {
 
     my $type;
     push @{ $opt->{path} }, $self->get_name();
+    # referenced types need type_prefix
     if ( my $typename = $self->get_type() ) {
         my ($prefix, $localname) = split /:/, $self->get_type();
         my $ns = $nsmap{ $prefix };
@@ -165,12 +166,18 @@ sub to_typemap {
         else
         {
             $type = $opt->{ wsdl }->first_types()->find_type( $ns, $localname );
-            $typeclass = $opt->{ prefix } . $type->get_name();
+            # referenced types need type_prefix (may be globally unique)
+            $typeclass = $opt->{ type_prefix } . $type->get_name();
             $txt .= $type->to_typemap($opt);
         }
         $txt .= q{'} . join( q{/}, @{ $opt->{path} } ) . "' => '$typeclass',\n";
     }
+    # atomic types need element prefix
     elsif ($type = $self->first_simpleType() ) {
+        # atomic types need element prefix (may be locally unique)
+        # TODO fix simpletype Typemap
+        my $typeclass = $opt->{ element_prefix } . $self->get_name();        
+        $txt .= q{'} . join( q{/}, @{ $opt->{path} } ) . "' => '$typeclass',\n";
         my $flavor = $type->get_flavor(); 
         if ( $flavor eq 'sequence' ) {
             $txt .= "# atomic simple type (sequence)\n";
@@ -185,7 +192,7 @@ sub to_typemap {
         
     }
     elsif ($type = $self->first_complexType() ) {
-        my $typeclass = $opt->{ prefix } . $self->get_name();        
+        my $typeclass = $opt->{ element_prefix } . $self->get_name();        
         $txt .= q{'} . join( q{/}, @{ $opt->{path} } ) . "' => '$typeclass',\n";
         my $flavor = $type->get_flavor(); 
         if ( $flavor eq 'sequence' ) {
@@ -223,6 +230,7 @@ use base qw(
     [% type.base_class($class_prefix) %]
 );
 [% ELSIF (type = self.first_complexType) %]
+# atomic complexType
 # <element name="[% self.get_name %]"><complexType> definition
 use SOAP::WSDL::XSD::Typelib::ComplexType;
 use base qw(
@@ -250,7 +258,7 @@ __PACKAGE__->_factory(
         IF nsmap.$prefix == 'http://www.w3.org/2001/XMLSchema' %]
         [% element.get_name %] => 'SOAP::WSDL::XSD::Typelib::Builtin::[% localname %]',        
         [% ELSE %]
-        [% element.get_name %] => '[% class_prefix %]::[% localname %]',
+        [% element.get_name %] => '[% type_prefix %]::[% localname %]',
         [% END %] 
       [% END %]
     }
@@ -266,7 +274,7 @@ __PACKAGE__->_factory(
 [%  IF (nsmap.$prefix == 'http://www.w3.org/2001/XMLSchema');
         base_class = 'SOAP::WSDL::XSD::Typelib::Builtin::' _ localname ;
     ELSE;
-        base_class = class_prefix _ '::' _ localname;
+        base_class = type_prefix _ '::' _ localname;
     -%]
 
 use [% base_class %];
@@ -298,6 +306,7 @@ EOT
     );
     my $code = $tt->process( \$template, {
             class_prefix => $opt->{ prefix },
+            type_prefix => $opt->{ type_prefix },
             self => $self, 
             nsmap => { reverse %{ $opt->{ wsdl }->get_xmlns() } },
         }, 

lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm

@@ -2,6 +2,7 @@ package SOAP::WSDL::XSD::Typelib::Builtin::string;
 use strict;
 use warnings;
 use Class::Std::Storable;
+# use HTML::Entities qw(encode_entities);
 use base qw(SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType);
 
 my %length_of           :ATTR(:name<length> :default<()>);
@@ -10,6 +11,31 @@ my %maxLength_of        :ATTR(:name<maxLength> :default<()>);
 my %pattern_of          :ATTR(:name<pattern> :default<()>);
 my %enumeration_of      :ATTR(:name<enumeration> :default<()>);
 my %whiteSpace_of       :ATTR(:name<whiteSpace> :default<()>);
+
+my %char2entity = (
+    q{&} => q{&amp;},
+    q{<} => q{&lt;},
+    q{>} => q{&gt;},
+    q{"} => q{&qout;},
+    q{'} => q{&apos;},
+);
+
+sub serialize {
+    my ($self, $opt) = @_;
+    my $ident = ident $self;
+    $opt ||= {};
+    my $value = $self->get_value();
+    return $self->start_tag({ %$opt, nil => 1})
+        if not defined $value;
+
+    # HTML::Entities does the same - and more, thus it's around 1/3 slower...
+    $value =~ s{([&<>"'])}{$char2entity{$1}}xgmso;
+
+    return join q{}, $self->start_tag($opt, $value)
+        #, encode_entities( $value, q{&<>"'} )
+        , $value
+        , $self->end_tag($opt);
+}
 
 1;
 
@@ -20,6 +46,11 @@ __END__
 =head1 NAME
 
 SOAP::WSDL::XSD::Typelib::Builtin::string - string objects
+
+=head1 DESCRIPTION
+
+String objects. XML entities (&, E<lt> E<gt> " ') are encoded on 
+serialization.
 
 =head1 LICENSE
 

lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm

@@ -89,9 +89,13 @@ sub START {
             my $method = "set_$_";
             $self->$method( $args_of->{ $_ } );    
        }
-       : $_ eq 'xmlns' 
+       : $_ =~ m{ \A              # beginning of string
+                  xmlns           # xmlns 
+            }xms  
             ? do {}
             : croak "unknown field $_ in $class";
+    # TODO maybe only warn for unknown fields ?
+
     } keys %$args_of;
 };