import SOAP-WSDL 2.00.06 from CPAN

git-cpan-module: SOAP-WSDL git-cpan-version: 2.00.06 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00.06.tar.gz
import SOAP-WSDL 2.00.05 from CPAN
2009-12-12 19:48:54 -08:00 · 2009-12-12 19:48:45 -08:00 · 2009-12-12 19:48:44 -08:00 · 2009-12-12 19:48:40 -08:00 · 2009-12-12 19:48:35 -08:00 · 2009-12-12 19:48:32 -08:00
277 changed files with 8572 additions and 4404 deletions
--- a/Build.PL
+++ b/Build.PL
@@ -2,10 +2,10 @@ use Module::Build;
 use version;
 $build = Module::Build->new(
    dist_author        => 'Martin Kutter <martin.kutter@fen-net.de>',
-    create_makefile_pl => 'passthrough',
+    create_makefile_pl => 'small',
    dist_abstract      => 'SOAP with WSDL support',
    dist_name          => 'SOAP-WSDL',
-    dist_version       => '2.00_31',
+    dist_version       => '2.00.06',
    module_name        => 'SOAP::WSDL',
    license            => 'artistic',
    requires           => {
@@ -13,7 +13,7 @@ $build = Module::Build->new(
        # for us. SOAP-WSDL relies on unicode (WS-I demands it)
        # and triggers several 5.6 bugs...
        'perl'                    => q(5.8.0),
-        'Class::Std::Fast'        => qv(0.0.5),
+        'Class::Std::Fast'        => q(0.0.5),
        'Data::Dumper'            => 0,
        'Date::Parse'             => 0,
        'Date::Format'            => 0,
@@ -22,25 +22,26 @@ $build = Module::Build->new(
        'Getopt::Long'            => 0,
        'List::Util'              => 0,
        'LWP::UserAgent'          => 0,
-        'Template'                => 0,
+        'Template'                => q(2.18),
        'Term::ReadKey'           => 0,
        'URI'                     => 0,
        'XML::Parser::Expat'      => 0,
    },
-    buildrequires => {
-        'Class::Std::Fast'        => qv(0.0.5),
+    build_requires => {
+        'Class::Std::Fast'        => q(0.0.5),
        'Cwd'                     => 0,
        'Date::Parse'             => 0,
        'Date::Format'            => 0,
        'Getopt::Long'            => 0,
        'List::Util'              => 0,
        'LWP::UserAgent'          => 0,
+        'Module::Build'           => 0,
        'File::Basename'          => 0,
        'File::Path'              => 0,
        'File::Spec'              => 0,
        'Storable'                => 0,
        'Test::More'              => 0,
-        'Template'                => 0,
+        'Template'                => q(2.18),
        'XML::Parser::Expat'      => 0,
    },
    recursive_test_files => 1,
--- a/208
+++ b/208
@@ -1,7 +1,7 @@
-Release notes for SOAP::WSDL 2.00_31
+Release notes for SOAP::WSDL 2.00.06
 -------

-I'm proud to present a new pre-release version of SOAP::WSDL.
+I'm proud to present a new release of SOAP::WSDL.

 SOAP::WSDL is a toolkit for creating WSDL-based SOAP client interfaces in perl.

@@ -15,6 +15,8 @@ Features:
    * Easy-to use API
          o Automatically encodes perl data structures as message data
          o Automatically sets HTTP headers right
+          o Datatypes provide hints on method names on calls to non-existant
+          methods
    * Efficient documentation
          o SOAP::WSDL::Manual guides you at getting your work done, not at
          the module's internals
@@ -23,17 +25,213 @@ Features:
          over 95% (excluding documentation - you wouldn't want to read
          through it all).
    * SOAP::Lite like look and feel
-          o Where possible, SOAP::WSDL mimics SOAP::Lite's API to allow easy migrations
+          o Where possible, SOAP::WSDL mimics SOAP::Lite's API to allow easy migration
    * XML schema based class library for creating data objects
-    * High-performance XML parser
+    * High-performance SOAP Message parser
    * Plugin support. SOAP::WSDL can be extended through plugins in various aspects.
      The following plugins are supported:
          o Transport plugins via SOAP::WSDL::Factory::Transport
          o Serializer plugins via SOAP::WSDL::Factory::Serializer
-          o Deserializer plugins via SOAP::WSDL::Factory::Serializer
+          o Deserializer plugins via SOAP::WSDL::Factory::Deserializer

 The following changes have been made:

+2.00.06 - Dec 03 2008
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+    * #40658 wsdl2perl - prefix option
+    The prefix option is now changed to behave more practical
+    * #40802 wsdl2perl problems with special url
+    The "fixed" attribute caused an error.
+    * #40650 Deserialization on inherited types
+    The inherited complexType variety (sequence/all/choice...) did not get
+    propagated to derived complexTypes. Thus, derived complexTypes which did
+    not add elements lost all inherited elements.
+    * #40108 Test failure on Cygwin
+    Fixes a test failure on Cygwin due to a malformed file:// URL
+    * #40021 charset: utf-8
+    Removed duplicate charset in HTTP requests issued by
+    SOAP::WSDL::Transport::HTTP. Replaced the utf8 by utf-8 in HTTP requests
+    * #39715 Error with complexType extension base without child elements
+    A rather subtle error caused by a wrong init value (undef) for the list
+    of child elements in a complexType sequence.
+    * [ 2005693 ] <maxLength fixed ="true"> causes error
+    * [ 2023797 ] type extensions not handled correctly
+    ComplexType objects now test their elements with ->isa, not with ref
+    * [ 2021755 ] Generating nested complexType extensions throws errors
+
+2.00.05 - Jul 13 2008
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+    * [ 2014482 ] Big-O memory hole when parsing WSDL
+    SOAP::WSDL still leaks memory when using SOAP::Lite's transport backend
+    This is to be fixed in 0.710.08 in SOAP::Lite
+    * #36865 wsdl2perl.pl fails on Expat error
+    Resolved by dropping a note for Solaris in README
+    * [ 2005693 ] <maxLength fixed ="true"> causes error
+    The >fixed< attribute is now recognized (but has no effect yet)
+
+The following uncategorized improvements have been made:
+
+    * added missing Class::Std::Storable::Fast import flags to
+    SOAP::WSDL::XSD::Typelib::Builtin::IDREFS
+    * some code cleanup
+
+2.00.04
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+    * [ 1972059 ] Can't set timeout via SOAP::WSDL
+    * [ 1961409 ] Error with unqualified references in imported schema
+    * #35873: SOAP::WSDL -- Can't locate object method "set_Action" via package "SOAP::WSDL::OpMessage"
+    * [ 1969427 ] Mod_Perl.t broken when mod_perl is unavailable
+    * #35610 Test fails when Test::Without::Module is installed
+
+The following uncategorized improvements have been made:
+
+    * Changed the environment variable for author tests to "RELEASE_TESTING",
+    as defined by the Oslo QA Hackathon 2008
+    (see http://perl-qa.hexten.net/wiki/index.php/Oslo_QA_Hackathon_2008_:Achievements)
+    * Enhanced documentation
+    * Fixed a wrong error message
+    * Cleaned up test suite (removed duplicate tests)
+
+2.00.03 - May 18 2008
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+    * [ 1966575 ] 2.00.02 produced bad code with complexType extensions
+
+2.00.02 - May 16 2008
+
+The following features were added (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660924):
+
+    * [ 1941134 ] Server for mod_perl2. Thanks to Noah Robin for contributing.
+    (I actually forgot to include it in 2.00.01)
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+    * [ 1963613 ] ComplexTypes die on ->can('FOOBAR');
+    * [ 1943667 ] Error parsing complexType/extension
+    * [ 1960650 ] multi-level inheritance of complexTypes fails
+    * [ 1960319 ] ComplexType as_hash_ref returns objects on maximum depth
+    * [ 1943673 ] Relative schemaLocation="" URLs not resolved in <import>
+    * [ 1953598 ] Cannot set server and attribute prefixes with wsdl2perl
+    * [ 1941080 ] 017_generator.t (test 2) fails with Template-Toolkit 2.15
+    * [ 1949209 ] spelling/grammar in Mod_Perl2.pm
+    * [ 1950670 ] on_action removed in SOAP::WSDL >= 2.00
+    * #35346 element ref="" not handled properly
+
+The following uncategorized improvements have been made:
+
+2.00.01
+
+The following features were added (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660924):
+
+    * [ 1941134 ] Server for mod_perl2. Thanks to Noah Robin for contributing.
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+    * [ 1944368 ] SOAP/WSDL/XSD/Typelib/SimpleType.pm spelling
+    * [ 1944367 ] SOAP/WSDL/XSD/Typelib/ComplexType.pm spelling
+    * [ 1944364 ] SOAP/WSDL/XSD/Typelib/Builtin.pm spelling
+    * [ 1944362 ] SOAP/WSDL/SOAP/Typelib/Fault11.pm spelling
+    * [ 1944361 ] SOAP/WSDL/Generator/Visitor.pm spelling
+    * [ 1944360 ] SOAP/WSDL/Generator/Iterator/WSDL11.pm spelling
+    * [ 1944359 ] SOAP::WSDL::Factory::Transport spelling
+    * [ 1944355 ] SOAP::WSDL::Deserializer::XSD.pm spelling
+    Thanks to "nobody" for correcting these errors.
+
+    * [ 1942576 ] SOAP/WSDL/Deserializer/SOM.pm spelling.
+    * [ 1942568 ] SOAP/WSDL/Client.pm minor spelling/grammar/style cleanup.
+    * [ 1942562 ] WSDL.pm spelling corrections.
+    Thanks to Noah Robin for providing patches for these errors.
+
+    * #34642 booleans in WSDL attributes don't get converted to perl's
+    representation (for now - not all attributes covered yet)
+    * #34714: MessageParser misses character data in elements just below SOAP-ENV:Body
+    * #34688: wsdl2perl.pl croaks when WSDL operation uses a header
+
+The following uncategorized improvements have been made:
+
+   * Storable freeze/thaw speedup in conjunction with upcoming version of
+   Class::Std::Fast
+   * improved server doc generation
+   * improved xsi:nil handling
+   * serializing an attribute from  http://www.w3.org/XML/1998/namespace now
+   serializes it with xml: prefix. This should probably be moved into the
+   generator, to avoid testing every attribute
+
+2.00_33 - Mar 30 2008
+
+The following features were added (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660924):
+
+   * [ 1925336 ] Create a Prefix Resolver Plugin Interface for Code Generator
+   * [ 1898591 ] object stringify returns undef
+   * [ 1906753 ] Hypens in MyTypes/* cause runtime syntax errors
+   Hypens and dots in variable and method names are now replaced by _
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+   * #33616: Bugs in the META.yml file
+   * [ 1892895 ] Test failures on RHEL4
+   * [ 1844956 ] t/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS fails test on OS X
+   * #33376: HTTP Authentication (not implemented or not documented)
+
+The following uncategorized improvements have been made:
+
+   * Some minor performance improvements have been made
+   * The XSD generator now asserts the soap:operation style is "document"
+   * <wsdl:import> and <xsd:import> now import namespace declarations, too
+   * The XSD generator now uses the relevant <wsdl:portType>'s
+   targetNamespace for finding operation messages, not the <wsdl:definition>
+   element's targetNamespace
+   * Attribute handling has been improved so it could possibly work.
+   Attributes from different namespaces are probably still broken.
+   * Attribute ref handling has been added (though probably broken on
+   ref cascades).
+   * <xsd:attributeGroup> elements are now parsed, but have no effect yet.
+   * <xsd:enumeration> elements are now parsed, but have no effect yet.
+
+2.00_32 - Feb 14 2008
+
+The following features were added (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660924):
+
+The following bugs have been fixed (the numbers in square brackets are the
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+The numbers with # are CPAN RT IDs (http://rt.cpan.org/).
+
+   * [ 1893147 ] Segfault on 2.0.0_31
+
+The following uncategorized improvements have been made:
+
+   * changed SOAP::WSDL::XSD::ComplexType's set_/get_flavor methods to
+     set_/get_variety to reflect the XML standard more closely.
+     get_flavor is retained for compatibility reasons.
+   * added initial support for complexType/simpleContent definitions. Right
+     now, only restriction derivations are supported.
+   * fixed an error in the generator_test.wsdl
+
 2.00_31 - Feb 11 2007

 The following features were added (the numbers in square brackets are the
--- a/141
+++ b/141
@@ -2,6 +2,145 @@ SOAP::WSDL is dual licensed under the same terms as
 Perl itself.

 This means at your choice, either the Perl Artistic License, or
-the GNU GPL version 1 or higher.
+the GNU GPL version 1 or - at your choice - any higher version.
+
+The GNU GPL can be obtained from
+http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt
+
+Newer versions can be found at http://www.gnu.org/licenses/gpl.html
+
+The Artistic License can be obtained from
+http://dev.perl.org/licenses/artistic.html and is included below.
+
+ARTISTIC LICENSE
+================


+             The "Artistic License"
+
+                Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+Definitions:
+
+    "Package" refers to the collection of files distributed by the
+    Copyright Holder, and derivatives of that collection of files
+    created through textual modification.
+
+    "Standard Version" refers to such a Package if it has not been
+    modified, or has been modified in accordance with the wishes
+    of the Copyright Holder as specified below.
+
+    "Copyright Holder" is whoever is named in the copyright or
+    copyrights for the package.
+
+    "You" is you, if you're thinking about copying or distributing
+    this Package.
+
+    "Reasonable copying fee" is whatever you can justify on the
+    basis of media cost, duplication charges, time of people involved,
+    and so on.  (You will not be required to justify it to the
+    Copyright Holder, but only to the computing community at large
+    as a market that must bear the fee.)
+
+    "Freely Available" means that no fee is charged for the item
+    itself, though there may be fees involved in handling the item.
+    It also means that recipients of the item may redistribute it
+    under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder.  A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+    a) place your modifications in the Public Domain or otherwise make them
+    Freely Available, such as by posting said modifications to Usenet or
+    an equivalent medium, or placing the modifications on a major archive
+    site such as uunet.uu.net, or by allowing the Copyright Holder to include
+    your modifications in the Standard Version of the Package.
+
+    b) use the modified Package only within your corporation or organization.
+
+    c) rename any non-standard executables so the names do not conflict
+    with standard executables, which must also be provided, and provide
+    a separate manual page for each non-standard executable that clearly
+    documents how it differs from the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+    a) distribute a Standard Version of the executables and library files,
+    together with instructions (in the manual page or equivalent) on where
+    to get the Standard Version.
+
+    b) accompany the distribution with the machine-readable source of
+    the Package with your modifications.
+
+    c) give non-standard executables non-standard names, and clearly
+    document the differences in manual pages (or equivalent), together
+    with instructions on where to get the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package.  You may charge any fee you choose for support of this
+Package.  You may not charge a fee for this Package itself.  However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own.  You may embed this Package's interpreter within
+an executable of yours (by linking); this shall be construed as a mere
+form of aggregation, provided that the complete Standard Version of the
+interpreter is so embedded.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whoever generated
+them, and may be sold commercially, and may be aggregated with this
+Package.  If such scripts or library files are aggregated with this
+Package via the so-called "undump" or "unexec" methods of producing a
+binary executable image, then distribution of such an image shall
+neither be construed as a distribution of this Package nor shall it
+fall under the restrictions of Paragraphs 3 and 4, provided that you do
+not represent such an executable image as a Standard Version of this
+Package.
+
+7. C subroutines (or comparably compiled subroutines in other
+languages) supplied by you and linked into this Package in order to
+emulate subroutines and variables of the language defined by this
+Package shall not be considered part of this Package, but are the
+equivalent of input as in Paragraph 6, provided these subroutines do
+not change the language in any way that would cause it to fail the
+regression tests for the language.
+
+8. Aggregation of this Package with a commercial distribution is always
+permitted provided that the use of this Package is embedded; that is,
+when no overt attempt is made to make this Package's interfaces visible
+to the end user of the commercial distribution.  Such use shall not be
+construed as a distribution of this Package.
+
+9. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+                The End
+
--- a/85
+++ b/85
@@ -1,11 +1,15 @@
 benchmark/01_expat.t
 benchmark/hello.pl
+benchmark/MEMORY_FOOTPRINT
 benchmark/person.pl
 benchmark/person.xml
 benchmark/person_profile.pl
+benchmark/person_single.pl
+benchmark/README
 benchmark/XSD/01_anyType.t
 benchmark/XSD/02_anySimpleType.t
 benchmark/XSD/03_string.t
+benchmark/XSD/strftime.pl
 bin/wsdl2perl.pl
 Build.PL
 Changes
@@ -92,9 +96,12 @@ lib/SOAP/WSDL/Factory/Deserializer.pm
 lib/SOAP/WSDL/Factory/Generator.pm
 lib/SOAP/WSDL/Factory/Serializer.pm
 lib/SOAP/WSDL/Factory/Transport.pm
+lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm
+lib/SOAP/WSDL/Generator/PrefixResolver.pm
 lib/SOAP/WSDL/Generator/Template.pm
+lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm
 lib/SOAP/WSDL/Generator/Template/XSD.pm
-lib/SOAP/WSDL/Generator/Template/XSD/_type_class.tt
+lib/SOAP/WSDL/Generator/Template/XSD/attribute.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/atomicTypes.tt
@@ -103,13 +110,23 @@ lib/SOAP/WSDL/Generator/Template/XSD/complexType/complexContent.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/contentModel.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/extension.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/all.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/attributeSet.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/choice.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/complexContent.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/content_model.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/restriction.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/extension.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/restriction.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/restriction.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/simpleContent.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/restriction.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent.tt
+lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent/extension.tt
 lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
 lib/SOAP/WSDL/Generator/Template/XSD/element.tt
+lib/SOAP/WSDL/Generator/Template/XSD/element/POD/contentModel.tt
 lib/SOAP/WSDL/Generator/Template/XSD/element/POD/structure.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Interface/Body.tt
@@ -121,6 +138,7 @@ lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/method_info.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Operation.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Part.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Type.tt
+lib/SOAP/WSDL/Generator/Template/XSD/POD/annotation.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Server.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Message.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/method_info.tt
@@ -130,16 +148,21 @@ lib/SOAP/WSDL/Generator/Template/XSD/simpleType.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/atomicType.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/contentModel.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/list.tt
+lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/contentModel.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/list.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/restriction.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/structure.tt
+lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/union.tt
 lib/SOAP/WSDL/Generator/Template/XSD/simpleType/restriction.tt
+lib/SOAP/WSDL/Generator/Template/XSD/simpleType/union.tt
 lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt
 lib/SOAP/WSDL/Generator/Visitor.pm
 lib/SOAP/WSDL/Generator/Visitor/Typelib.pm
 lib/SOAP/WSDL/Generator/Visitor/Typemap.pm
 lib/SOAP/WSDL/Manual.pod
+lib/SOAP/WSDL/Manual/Cookbook.pod
 lib/SOAP/WSDL/Manual/Deserializer.pod
+lib/SOAP/WSDL/Manual/FAQ.pod
 lib/SOAP/WSDL/Manual/Glossary.pod
 lib/SOAP/WSDL/Manual/Parser.pod
 lib/SOAP/WSDL/Manual/Serializer.pod
@@ -154,6 +177,7 @@ lib/SOAP/WSDL/PortType.pm
 lib/SOAP/WSDL/Serializer/XSD.pm
 lib/SOAP/WSDL/Server.pm
 lib/SOAP/WSDL/Server/CGI.pm
+lib/SOAP/WSDL/Server/Mod_Perl2.pm
 lib/SOAP/WSDL/Service.pm
 lib/SOAP/WSDL/SOAP/Address.pm
 lib/SOAP/WSDL/SOAP/Body.pm
@@ -166,13 +190,27 @@ lib/SOAP/WSDL/Transport/Loopback.pm
 lib/SOAP/WSDL/Transport/Test.pm
 lib/SOAP/WSDL/TypeLookup.pm
 lib/SOAP/WSDL/Types.pm
+lib/SOAP/WSDL/XSD/Annotation.pm
 lib/SOAP/WSDL/XSD/Attribute.pm
+lib/SOAP/WSDL/XSD/AttributeGroup.pm
 lib/SOAP/WSDL/XSD/Builtin.pm
 lib/SOAP/WSDL/XSD/ComplexType.pm
 lib/SOAP/WSDL/XSD/Element.pm
+lib/SOAP/WSDL/XSD/Enumeration.pm
+lib/SOAP/WSDL/XSD/FractionDigits.pm
+lib/SOAP/WSDL/XSD/Group.pm
+lib/SOAP/WSDL/XSD/Length.pm
+lib/SOAP/WSDL/XSD/MaxExclusive.pm
+lib/SOAP/WSDL/XSD/MaxInclusive.pm
+lib/SOAP/WSDL/XSD/MaxLength.pm
+lib/SOAP/WSDL/XSD/MinExclusive.pm
+lib/SOAP/WSDL/XSD/MinInclusive.pm
+lib/SOAP/WSDL/XSD/MinLength.pm
+lib/SOAP/WSDL/XSD/Pattern.pm
 lib/SOAP/WSDL/XSD/Schema.pm
 lib/SOAP/WSDL/XSD/Schema/Builtin.pm
 lib/SOAP/WSDL/XSD/SimpleType.pm
+lib/SOAP/WSDL/XSD/TotalDigits.pm
 lib/SOAP/WSDL/XSD/Typelib/Attribute.pm
 lib/SOAP/WSDL/XSD/Typelib/AttributeSet.pm
 lib/SOAP/WSDL/XSD/Typelib/Builtin.pm
@@ -225,26 +263,23 @@ lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm
 lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
 lib/SOAP/WSDL/XSD/Typelib/Element.pm
 lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
+lib/SOAP/WSDL/XSD/WhiteSpace.pm
 LICENSE
 Makefile.PL
 MANIFEST			This list of files
 META.yml
 MIGRATING
 README
-t/001_use.t
 t/002_parse_wsdl.t
 t/003_wsdl_based_serializer.t
-t/004_parse_wsdl.t
 t/006_client.t
-t/007_envelope.t
 t/008_client_wsdl_complexType.t
 t/009_data_classes.t
 t/011_simpleType.t
 t/012_element.t
 t/013_complexType.t
 t/016_client_object.t
-t/017_generator.t
-t/020_storable.t
+t/094_cpan_meta.t
 t/095_copying.t
 t/096_characters.t
 t/097_kwalitee.t
@@ -281,22 +316,33 @@ t/acceptance/wsdl/email_account.wsdl
 t/acceptance/wsdl/generator_test.wsdl
 t/acceptance/wsdl/generator_test_dot_names.wsdl
 t/acceptance/wsdl/generator_unsupported_test.wsdl
+t/acceptance/wsdl/helloWorld_header.wsdl
 t/acceptance/wsdl/import.xsd
+t/acceptance/wsdl/import_loop.xsd
 t/acceptance/wsdl/message_gateway.wsdl
+t/acceptance/wsdl/nested_complextype.wsdl
 t/acceptance/wsdl/WSDLParser-import.wsdl
 t/acceptance/wsdl/WSDLParser-imported.wsdl
 t/acceptance/wsdl/WSDLParser.wsdl
+t/acceptance/wsdl/WSDLParser/import_cascade.xsd
+t/acceptance/wsdl/WSDLParser/import_no_location.wsdl
+t/acceptance/wsdl/WSDLParser/import_xsd_cascade.wsdl
+t/acceptance/wsdl/WSDLParser/imported.xsd
+t/acceptance/wsdl/WSDLParser/xsd_import_no_location.wsdl
+t/acceptance/wsdl/WSDLParser_import_loop.wsdl
 t/contributed.wsdl
-t/Expat/03_wsdl.t
+t/lib/Mod_Perl2Test.pm
 t/lib/MyComplexType.pm
 t/lib/MyElement.pm
 t/lib/MySimpleType.pm
-t/lib/Test/SOAPMessage.pm
+t/lib/Test/SOAP/WSDL/Expat/WSDLParser.pm
+t/lib/Test/SOAP/WSDL/Generator/Iterator/WSDL11.pm
+t/lib/Test/SOAP/WSDL/Generator/Visitor/Typemap.pm
+t/lib/Test/SOAP/WSDL/Tester.pm
 t/lib/Typelib/Base.pm
 t/lib/Typelib/TEnqueueMessage.pm
 t/lib/Typelib/TMessage.pm
 t/SOAP/WSDL.t
-t/SOAP/WSDL/01_use.t
 t/SOAP/WSDL/02_port.t
 t/SOAP/WSDL/03_complexType-all.t
 t/SOAP/WSDL/03_complexType-choice.t
@@ -314,6 +360,7 @@ t/SOAP/WSDL/05_simpleType-union.t
 t/SOAP/WSDL/06_keep_alive.t
 t/SOAP/WSDL/11_helloworld.NET.t
 t/SOAP/WSDL/12_binding.t
+t/SOAP/WSDL/Base.t
 t/SOAP/WSDL/Client.t
 t/SOAP/WSDL/Client/Base.t
 t/SOAP/WSDL/Definitions.t
@@ -327,29 +374,35 @@ t/SOAP/WSDL/Factory/Deserializer.t
 t/SOAP/WSDL/Factory/Serializer.t
 t/SOAP/WSDL/Factory/Transport.t
 t/SOAP/WSDL/Generator/Template.t
+t/SOAP/WSDL/Generator/Template/XSD/Import.t
 t/SOAP/WSDL/Generator/Visitor.t
 t/SOAP/WSDL/Generator/Visitor/Typemap.t
-t/SOAP/WSDL/Generator/XCS.t
 t/SOAP/WSDL/Generator/XSD.t
+t/SOAP/WSDL/Generator/XSD_custom_resolver.t
 t/SOAP/WSDL/Generator/XSD_dot_names.t
+t/SOAP/WSDL/Generator/XSD_nested_complextype.t
 t/SOAP/WSDL/Generator/XSD_unsupported.t
 t/SOAP/WSDL/Part.t
 t/SOAP/WSDL/PortType.t
 t/SOAP/WSDL/Serializer/XSD.t
 t/SOAP/WSDL/Server.t
 t/SOAP/WSDL/Server/CGI.t
+t/SOAP/WSDL/Server/Mod_Perl2.t
 t/SOAP/WSDL/Transport/01_Test.t
-t/SOAP/WSDL/Transport/02_HTTP.t
 t/SOAP/WSDL/Transport/acceptance/test2.xml
 t/SOAP/WSDL/Transport/acceptance/test3.xml
+t/SOAP/WSDL/Transport/HTTP.t
 t/SOAP/WSDL/Typelib/Fault11.t
+t/SOAP/WSDL/Types.t
 t/SOAP/WSDL/XSD/Attribute.t
+t/SOAP/WSDL/XSD/AttributeGroup.t
+t/SOAP/WSDL/XSD/Builtin.t
 t/SOAP/WSDL/XSD/ComplexType.t
 t/SOAP/WSDL/XSD/Element.t
+t/SOAP/WSDL/XSD/Enumeration.t
 t/SOAP/WSDL/XSD/Schema.t
 t/SOAP/WSDL/XSD/SimpleType.t
 t/SOAP/WSDL/XSD/Typelib/Attribute.t
-t/SOAP/WSDL/XSD/Typelib/Builtin/01_constructors.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/anyType.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.t
@@ -360,8 +413,14 @@ t/SOAP/WSDL/XSD/Typelib/Builtin/date.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/dateTime.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/decimal.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/double.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/duration.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/float.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/gDay.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/gMonth.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/gYear.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/ID.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.t
@@ -381,6 +440,7 @@ t/SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.t
+t/SOAP/WSDL/XSD/Typelib/Builtin/QName.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/short.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/string.t
 t/SOAP/WSDL/XSD/Typelib/Builtin/time.t
@@ -398,4 +458,5 @@ t/SOAP/WSDL_NO_MESSAGE.wsdl
 t/SOAP/WSDL_NO_PORTTYPE.wsdl
 t/test.wsdl
 TEST_COVERAGE
+test_html.pl
 TODO
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 ---
 name: SOAP-WSDL
-version: 2.00_31
+version: 2.00.06
 author:
  - 'Martin Kutter <martin.kutter@fen-net.de>'
 abstract: SOAP with WSDL support
@@ -8,13 +8,7 @@ license: artistic
 resources:
  license: http://opensource.org/licenses/artistic-license.php
 requires:
-  Class::Std::Fast: !!perl/hash:version
-    original: v0.0.5
-    qv: 1
-    version:
-      - 0
-      - 0
-      - 5
+  Class::Std::Fast: 0.0.5
  Data::Dumper: 0
  Date::Format: 0
  Date::Parse: 0
@@ -23,154 +17,244 @@ requires:
  Getopt::Long: 0
  LWP::UserAgent: 0
  List::Util: 0
-  Template: 0
+  Template: 2.18
  Term::ReadKey: 0
  URI: 0
  XML::Parser::Expat: 0
  perl: 5.8.0
+build_requires:
+  Class::Std::Fast: 0.0.5
+  Cwd: 0
+  Date::Format: 0
+  Date::Parse: 0
+  File::Basename: 0
+  File::Path: 0
+  File::Spec: 0
+  Getopt::Long: 0
+  LWP::UserAgent: 0
+  List::Util: 0
+  Module::Build: 0
+  Storable: 0
+  Template: 2.18
+  Test::More: 0
+  XML::Parser::Expat: 0
 provides:
  SOAP::WSDL:
    file: lib/SOAP/WSDL.pm
-    version: 2.00_31
+    version: 2.00.06
  SOAP::WSDL::Base:
    file: lib/SOAP/WSDL/Base.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Binding:
    file: lib/SOAP/WSDL/Binding.pm
+    version: 2.00.05
  SOAP::WSDL::Client:
    file: lib/SOAP/WSDL/Client.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Client::Base:
    file: lib/SOAP/WSDL/Client/Base.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Definitions:
    file: lib/SOAP/WSDL/Definitions.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Deserializer::Hash:
    file: lib/SOAP/WSDL/Deserializer/Hash.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Deserializer::SOM:
    file: lib/SOAP/WSDL/Deserializer/SOM.pm
-    version: 2.00_24
+    version: 2.00.05
  SOAP::WSDL::Deserializer::XSD:
    file: lib/SOAP/WSDL/Deserializer/XSD.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Expat::Base:
    file: lib/SOAP/WSDL/Expat/Base.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Expat::Message2Hash:
    file: lib/SOAP/WSDL/Expat/Message2Hash.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Expat::MessageParser:
    file: lib/SOAP/WSDL/Expat/MessageParser.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Expat::MessageStreamParser:
    file: lib/SOAP/WSDL/Expat/MessageStreamParser.pm
-    version: 2.00_24
+    version: 2.00.05
+  SOAP::WSDL::Expat::WSDLParser:
+    file: lib/SOAP/WSDL/Expat/WSDLParser.pm
+    version: 2.00.05
  SOAP::WSDL::Factory::Deserializer:
    file: lib/SOAP/WSDL/Factory/Deserializer.pm
-    version: 2.00_24
+    version: 2.00.05
  SOAP::WSDL::Factory::Generator:
    file: lib/SOAP/WSDL/Factory/Generator.pm
-    version: 2.00_24
+    version: 2.00.05
  SOAP::WSDL::Factory::Serializer:
    file: lib/SOAP/WSDL/Factory/Serializer.pm
-    version: 2.00_24
+    version: 2.00.05
  SOAP::WSDL::Factory::Transport:
    file: lib/SOAP/WSDL/Factory/Transport.pm
-    version: 2.00_31
+    version: 2.00.05
+  SOAP::WSDL::Generator::Iterator::WSDL11:
+    file: lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm
+    version: 2.00.05
+  SOAP::WSDL::Generator::PrefixResolver:
+    file: lib/SOAP/WSDL/Generator/PrefixResolver.pm
+    version: 2.00.05
  SOAP::WSDL::Generator::Template:
    file: lib/SOAP/WSDL/Generator/Template.pm
-    version: 2.00_25
+    version: 2.00.05
+  SOAP::WSDL::Generator::Template::Plugin::XSD:
+    file: lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm
+    version: 2.00.05
  SOAP::WSDL::Generator::Template::XSD:
    file: lib/SOAP/WSDL/Generator/Template/XSD.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Generator::Visitor:
    file: lib/SOAP/WSDL/Generator/Visitor.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Generator::Visitor::Typelib:
    file: lib/SOAP/WSDL/Generator/Visitor/Typelib.pm
+    version: 2.00.05
  SOAP::WSDL::Generator::Visitor::Typemap:
    file: lib/SOAP/WSDL/Generator/Visitor/Typemap.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Message:
    file: lib/SOAP/WSDL/Message.pm
+    version: 2.00.05
  SOAP::WSDL::OpMessage:
    file: lib/SOAP/WSDL/OpMessage.pm
+    version: 2.00.05
  SOAP::WSDL::Operation:
    file: lib/SOAP/WSDL/Operation.pm
+    version: 2.00.05
  SOAP::WSDL::Part:
    file: lib/SOAP/WSDL/Part.pm
+    version: 2.00.05
  SOAP::WSDL::Port:
    file: lib/SOAP/WSDL/Port.pm
+    version: 2.00.05
  SOAP::WSDL::PortType:
    file: lib/SOAP/WSDL/PortType.pm
+    version: 2.00.05
  SOAP::WSDL::SOAP::Address:
    file: lib/SOAP/WSDL/SOAP/Address.pm
+    version: 2.00.05
  SOAP::WSDL::SOAP::Body:
    file: lib/SOAP/WSDL/SOAP/Body.pm
+    version: 2.00.05
  SOAP::WSDL::SOAP::Header:
    file: lib/SOAP/WSDL/SOAP/Header.pm
+    version: 2.00.05
  SOAP::WSDL::SOAP::HeaderFault:
    file: lib/SOAP/WSDL/SOAP/HeaderFault.pm
+    version: 2.00.05
  SOAP::WSDL::SOAP::Operation:
    file: lib/SOAP/WSDL/SOAP/Operation.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::SOAP::Typelib::Fault11:
    file: lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Serializer::XSD:
    file: lib/SOAP/WSDL/Serializer/XSD.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Server:
    file: lib/SOAP/WSDL/Server.pm
-    version: 2.00_27
+    version: 2.00.05
  SOAP::WSDL::Server::CGI:
    file: lib/SOAP/WSDL/Server/CGI.pm
-    version: 2.00_27
+    version: 2.00.06
+  SOAP::WSDL::Server::Mod_Perl2:
+    file: lib/SOAP/WSDL/Server/Mod_Perl2.pm
+    version: 2.00.05
  SOAP::WSDL::Service:
    file: lib/SOAP/WSDL/Service.pm
+    version: 2.00.05
  SOAP::WSDL::Transport::HTTP:
    file: lib/SOAP/WSDL/Transport/HTTP.pm
+    version: 2.00.05
  SOAP::WSDL::Transport::Loopback:
    file: lib/SOAP/WSDL/Transport/Loopback.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::Transport::Test:
    file: lib/SOAP/WSDL/Transport/Test.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::TypeLookup:
    file: lib/SOAP/WSDL/TypeLookup.pm
-    version: 2.00_31
+    version: 2.00.05
  SOAP::WSDL::Types:
    file: lib/SOAP/WSDL/Types.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::Annotation:
+    file: lib/SOAP/WSDL/XSD/Annotation.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::Attribute:
    file: lib/SOAP/WSDL/XSD/Attribute.pm
-    version: 2.00_29
+    version: 2.00.05
+  SOAP::WSDL::XSD::AttributeGroup:
+    file: lib/SOAP/WSDL/XSD/AttributeGroup.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::Builtin:
    file: lib/SOAP/WSDL/XSD/Builtin.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::ComplexType:
    file: lib/SOAP/WSDL/XSD/ComplexType.pm
-    version: 2.00_29
+    version: 2.00.06
  SOAP::WSDL::XSD::Element:
    file: lib/SOAP/WSDL/XSD/Element.pm
-    version: 2.00_25
+    version: 2.00.05
+  SOAP::WSDL::XSD::Enumeration:
+    file: lib/SOAP/WSDL/XSD/Enumeration.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::FractionDigits:
+    file: lib/SOAP/WSDL/XSD/FractionDigits.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::Group:
+    file: lib/SOAP/WSDL/XSD/Group.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::Length:
+    file: lib/SOAP/WSDL/XSD/Length.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::MaxExclusive:
+    file: lib/SOAP/WSDL/XSD/MaxExclusive.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::MaxInclusive:
+    file: lib/SOAP/WSDL/XSD/MaxInclusive.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::MaxLength:
+    file: lib/SOAP/WSDL/XSD/MaxLength.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::MinExclusive:
+    file: lib/SOAP/WSDL/XSD/MinExclusive.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::MinInclusive:
+    file: lib/SOAP/WSDL/XSD/MinInclusive.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::MinLength:
+    file: lib/SOAP/WSDL/XSD/MinLength.pm
+    version: 2.00.05
+  SOAP::WSDL::XSD::Pattern:
+    file: lib/SOAP/WSDL/XSD/Pattern.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::Schema:
    file: lib/SOAP/WSDL/XSD/Schema.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::XSD::Schema::Builtin:
    file: lib/SOAP/WSDL/XSD/Schema/Builtin.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::SimpleType:
    file: lib/SOAP/WSDL/XSD/SimpleType.pm
-    version: 2.00_25
+    version: 2.00.05
+  SOAP::WSDL::XSD::TotalDigits:
+    file: lib/SOAP/WSDL/XSD/TotalDigits.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Attribute:
    file: lib/SOAP/WSDL/XSD/Typelib/Attribute.pm
-    version: 2.00_29
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::AttributeSet:
    file: lib/SOAP/WSDL/XSD/Typelib/AttributeSet.pm
-    version: 2.00_29
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Builtin:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Builtin::ENTITY:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm
  SOAP::WSDL::XSD::Typelib::Builtin::ID:
@@ -195,14 +279,14 @@ provides:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm
  SOAP::WSDL::XSD::Typelib::Builtin::anyType:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm
-    version: 2.00_29
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Builtin::anyURI:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm
  SOAP::WSDL::XSD::Typelib::Builtin::base64Binary:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm
  SOAP::WSDL::XSD::Typelib::Builtin::boolean:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm
-    version: 2.00_23
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Builtin::byte:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm
  SOAP::WSDL::XSD::Typelib::Builtin::date:
@@ -255,7 +339,7 @@ provides:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm
  SOAP::WSDL::XSD::Typelib::Builtin::time:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm
-    version: 2.00_25
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Builtin::token:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm
  SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte:
@@ -268,15 +352,20 @@ provides:
    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm
  SOAP::WSDL::XSD::Typelib::ComplexType:
    file: lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
-    version: 2.00_31
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::Element:
    file: lib/SOAP/WSDL/XSD/Typelib/Element.pm
-    version: 2.00_29
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::SimpleType:
    file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
+    version: 2.00.05
  SOAP::WSDL::XSD::Typelib::SimpleType::restriction:
    file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
-generated_by: Module::Build version 0.2808
+    version: 2.00.05
+  SOAP::WSDL::XSD::WhiteSpace:
+    file: lib/SOAP/WSDL/XSD/WhiteSpace.pm
+    version: 2.00.05
+generated_by: Module::Build version 0.3
 meta-spec:
  url: http://module-build.sourceforge.net/META-spec-v1.2.html
  version: 1.2
--- a/27
+++ b/27
@@ -1,5 +1,18 @@
 MIGRATING
 ---------
+MIGRATING FROM PRE-2.00_33
+--------------------------
+The handling of stringification of SOAP::WSDL::XSD simpleType objects with
+undef values changed in 2.00_33.
+
+While 2.00_32 and before returned undef on stringification of a undef value,
+>=2.00_33 now returns an empty string.
+
+This is due to common usage in templates or the like, where undef is likely
+to produce a warning, and the unreliable behavior of
+ $obj eq undef
+which behaves differently in different versions of perl.
+

 MIGRATING FROM PRE-2.00_29
 --------------------------
@@ -9,7 +22,7 @@ require the class SOAP::WSDL::XSD::Typelib::Attribute introduced in the same
 pre-release.

 While interfaces generated with pre-releases back to 2.00_25 work without
-change, this does not hold true vice versa: Interfaces generated with 
+change, this does not hold true vice versa: Interfaces generated with
 2.00_29 and above won't work with older pre-releases.

 You'll have to update SOAP::WSDL on all your machines.
@@ -17,7 +30,7 @@ You'll have to update SOAP::WSDL on all your machines.
 MIGRATING FROM PRE-2.00_24
 --------------------------

-This section describes how to migrate from 2.00_24 and before versions to 
+This section describes how to migrate from 2.00_24 and before versions to
 2.00_25.

 Migrating from 2.00_xx
@@ -25,9 +38,9 @@ Migrating from 2.00_xx

 Background

-SOAP::WSDL 2.00_xx has used Class::Std as base for its inside out objects 
+SOAP::WSDL 2.00_xx has used Class::Std as base for its inside out objects
 up to 2.00_24. For performance reasons, now Class::Std::Fast is used.
-As Class::Std::Fast is a drop-in replacement for Class::Std, there should be 
+As Class::Std::Fast is a drop-in replacement for Class::Std, there should be
 no need to change anything in your (handwritten) code.

 Generated interfaces
@@ -42,8 +55,8 @@ Typemaps

 SOAP::WSDL now tries to load all typemap classes at once from 2.00_25 on.

-If you use __SKIP__ in your typemaps, you'll have to comment out all 
-path deeper than the path marked with __SKIP__ - if you don't, SOAP::WSDL 
+If you use __SKIP__ in your typemaps, you'll have to comment out all
+paths deeper than the path marked with __SKIP__ - if you don't, SOAP::WSDL
 will try to load all correspondent classes.

 Migrating from 1.xx
@@ -55,7 +68,7 @@ SOAP::WSDL uses a custom WSDL parser and serializer. It does not rely on XPath
 for on the fly WSDL processing, nor does it use SOAP::Data objects for
 encoding any more.

-You should be able to use your wxisting code under most circumstances.
+You should be able to use your existing code under most circumstances.
 SOAP::WSDL is the compatibility module for old interfaces.

 Overloading
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,30 +1,6 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
-    unless (eval "use Module::Build::Compat 0.02; 1" ) {
-      print "This module requires Module::Build to install itself.\n";
-      
-      require ExtUtils::MakeMaker;
-      my $yn = ExtUtils::MakeMaker::prompt
-	('  Install Module::Build now from CPAN?', 'y');
-      
-      unless ($yn =~ /^y/i) {
-	die " *** Cannot install without Module::Build.  Exiting ...\n";
-      }
-      
-      require Cwd;
-      require File::Spec;
-      require CPAN;
-      
-      # Save this 'cause CPAN will chdir all over the place.
-      my $cwd = Cwd::cwd();
-      
-      CPAN::Shell->install('Module::Build::Compat');
-      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
-	or die "Couldn't install Module::Build, giving up.\n";
-      
-      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    }
-    eval "use Module::Build::Compat 0.02; 1" or die $@;
+# Note: this file was auto-generated by Module::Build::Compat version 0.30
+require 5.8.0;
+    use Module::Build::Compat 0.02;
    
    Module::Build::Compat->run_build_pl(args => \@ARGV);
    require Module::Build;
--- a/37
+++ b/37
@@ -3,7 +3,25 @@ INTRO

 SOAP-WSDL provides a SOAP client with WSDL support.

-This is a developer release - everything may (and most things will) change.
+SUBCLASSING
+-----------
+
+SOAP-WSDL is still under very active development. Please don't build
+applications using the following modules directly:
+
+ - SOAP::WSDL::Definitions
+ - SOAP::WSDL::Port
+ - SOAP::WSDL::PortType
+ - SOAP::WSDL::Binding
+ - SOAP::WSDL::Message
+ - SOAP::WSDL::Operation
+ - SOAP::WSDL::OpMessage
+ - SOAP::WSDL::Part
+ - SOAP::WSDL::Service
+ - SOAP::WSDL::Types
+ - SOAP::WSDL::XSD::Schema
+
+Those will be replaced some time in the future.

 INSTALLING
 ----------
@@ -15,12 +33,21 @@ Use the following mantra:
 perl Build test
 perl Build install

-If you don't have Module::Build installed, you may also use 
+If you don't have Module::Build installed, you may also use

 perl Makefile.PL
- make 
+ make
 make test
 make install

-Note that Module::Build is the recommended installer - make will not run 
-all tests provided with SOAP-WSDL.
+Note that Module::Build is the recommended installer - make will not run
+all tests provided with SOAP-WSDL.
+
+SOLARIS INSTALLATION NOTES
+--------------------------
+According to a CPAN RT report http://rt.cpan.org/Ticket/Display.html?id=36865
+it may be necessary to check (and possibly update) the expat libraries
+required by XML::Parser.
+
+SOAP::WSDL's metadata includes XML::Parser, but it seems that the expat
+libraries XML::Parser depends on may slip through missing or outdated.
--- a/20
+++ b/20
@@ -1,11 +1,23 @@
 # Unfortunately, Build testcover reports test coverage wrong.
 #
-# To get a complete coverage report, just run this file as a shell script 
+# To get a complete coverage report, just run this file as a shell script
 # on a linux box (or execute the equivalent commands on another OS):
+#
+# Note that this shell script requires Devel::CoverX::Covered - if you
+# don't have it, comment out the line noted below
+#

-cd t/
+perl -Ilib -It/lib -MTAP::Harness -MFile::Find::Rule -e '
+    local $ENV{TEST_VERBOSE} = 1;
+    TAP::Harness->new({
+         merge => 1,
+         lib => [ q{t/lib}, q{lib} ],
+         switches => [ q{-MDevel::Cover=-ignore,.,-select,^lib/.+,-coverage,statement,-coverage,subroutine,-coverage,condition,-coverage,branch} ],
+    })->runtests( sort { $a cmp $b } File::Find::Rule->file()->name( q{*.t} )->in( q{t/} ) );
+'

-find . -type f -name '*.t' | xargs -n 1 /usr/bin/perl -MDevel::Cover=-silent,1,-summary,0 -I../lib
+# Devel::CoverX::Covered
+# covered runs

-cover -ignore_re \.t$ -ignore_re ^lib -coverage="statement" -coverage=condition -coverage=subroutine -coverage="branch"
+cover -coverage="statement" -coverage=condition -coverage=subroutine -coverage="branch"

--- a/5
+++ b/5
@@ -1,10 +1,5 @@
 TODO list for SOAP::WSDL

-2.00 Pre-releases
--------
-
-* Act as SOAP Server [ 1842436 ] 
-
 2.1 release
 --------
 * Support namespaces in SOAP message payload [ 1809057 ]
--- a/benchmark/01_expat.t
+++ b/benchmark/01_expat.t
@@ -1,15 +1,17 @@
 #!/usr/bin/perl -w
-%DB::packages=(SOAP::WSDL::Expat::MessageParser => 1);
 use strict;
 use warnings;
 use lib '../lib';
 use lib '../../Class-Std-Fast/lib';
+use lib '/home/martin/workspace/SOAP-WSDL_XS/blib/lib';
+use lib '/home/martin/workspace/SOAP-WSDL_XS/blib/arch';
 use lib '../t/lib';
 # use SOAP::WSDL::SAX::MessageHandler;

 use Benchmark qw(cmpthese timethese);
 use SOAP::WSDL::Expat::MessageParser;
 use SOAP::WSDL::Expat::Message2Hash;
+use SOAP::WSDL::Expat::MessageParser_XS;
 use SOAP::Lite;
 use XML::Simple;
 use XML::LibXML;
@@ -17,24 +19,50 @@ use MyComplexType;
 use MyElement;
 use MySimpleType;

-my $xml = q{<SOAP-ENV:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+my $xml = q{<SOAP-ENV:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" >
    <SOAP-ENV:Body>
    <MyAtomicComplexTypeElement xmlns="urn:Test" >
    <test>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test2</test2>
-    <test2 >Test55</test2>
+        <test2 >Test2</test2>
+        <test2 >Test3</test2>
+        <test2 >Test4</test2>
+        <test2 >Test5</test2>
+        <test2 >Test6</test2>
+        <test2 >Test7</test2>
+        <test2 >Test8</test2>
+        <test2 >Test9</test2>
+        <test2 >Test10</test2>
+        <test2 >Test11</test2>
+        <test2 >Test12</test2>
+        <test2 >Test13</test2>
+        <test2 >Test55</test2>
+        <test2 >Test14</test2>
+        <test2 >Test15</test2>
+        <test2 >Test16</test2>
+        <test2 >Test17</test2>
+        <test2 >Test18</test2>
+        <test2 >Test19</test2>
+        <test2 >Test20</test2>
+        <test2 >Test21</test2>
+        <test2 >Test22</test2>
+        <test2 >Test23</test2>
+        <test2 >Test24</test2>
+        <test2 >Test25</test2>
+        <test2 >Test565</test2>
+        <test2 >Test27</test2>
+        <test2 >Test28</test2>
+        <test2 >Test29</test2>
+        <test2 >Test30</test2>
+        <test2 >Test31</test2>
+        <test2 >Test32</test2>
+        <test2 >Test33</test2>
+        <test2 >Test34</test2>
+        <test2 >Test35</test2>
+        <test2 >Test36</test2>
+        <test2 >Test37</test2>
+        <test2 >Test38</test2>
+        <test2 >Test55</test2>
    </test>
    </MyAtomicComplexTypeElement>
 </SOAP-ENV:Body></SOAP-ENV:Envelope>};
@@ -57,13 +85,17 @@ my @data;

 my $deserializer = SOAP::Deserializer->new();

-sub libxml_test { 
+my $parser_xs = SOAP::WSDL::Expat::MessageParser_XS->new({
+    class_resolver => 'FakeResolver'
+});
+
+sub libxml_test {
        my $dom = $libxml->parse_string( $xml );
        push @data, dom2hash( $dom->firstChild );
 };

 sub dom2hash {
-    for ($_[0]->childNodes) {  
+    for ($_[0]->childNodes) {
        if (exists $_[1]->{ $_->nodeName }) {
            if (ref $_[1]->{ $_->nodeName } eq 'ARRAY') {
                if ($_->nodeName eq '#text') {
@@ -78,7 +110,7 @@ sub dom2hash {
                    $_[1] = [ $_[1], $_->textContent() ];
                }
                else {
-                    $_[1]->{ $_->nodeName } = [ $_[1]->{ $_->nodeName } , 
+                    $_[1]->{ $_->nodeName } = [ $_[1]->{ $_->nodeName } ,
                        dom2hash( $_, {} ) ];
                }
            }
@@ -94,11 +126,11 @@ sub dom2hash {
    }
    return $_[1];
 }
-
-cmpthese 5000, 
+cmpthese 5000,
 {
  'SOAP::WSDL (Hash)' => sub { push @data, $hash_parser->parse( $xml ) },
  'SOAP::WSDL (XSD)' => sub { push @data, $parser->parse( $xml ) },
+  'SOAP::WSDL_XS (XSD)' => sub { push @data, $parser_xs->parse_string( $xml ) },
  'XML::Simple (Hash)' => sub { push @data, XMLin $xml },
  'XML::LibXML (DOM)' => sub { push @data,  $libxml->parse_string( $xml ) },
  'XML::LibXML (Hash)' => \&libxml_test,
@@ -128,3 +160,18 @@ BEGIN {
        };
    };
 };
+
+
+__END__
+
+Output on my machine:
+
+ xml length: 641 bytes
+                       Rate SOAP::Lite XML::Simple (Hash) SOAP::WSDL (XSD) XML::LibXML (Hash) SOAP::WSDL (Hash) SOAP::WSDL_XS (XSD) XML::LibXML (DOM)
+ SOAP::Lite            446/s         --               -54%             -72%               -73%              -80%                -95%              -96%
+ XML::Simple (Hash)    963/s       116%                 --             -39%               -41%              -57%                -89%              -91%
+ SOAP::WSDL (XSD)     1587/s       256%                65%               --                -3%              -29%                -81%              -86%
+ XML::LibXML (Hash)   1629/s       265%                69%               3%                 --              -27%                -81%              -85%
+ SOAP::WSDL (Hash)    2222/s       398%               131%              40%                36%                --                -74%              -80%
+ SOAP::WSDL_XS (XSD)  8475/s      1798%               780%             434%               420%              281%                  --              -24%
+ XML::LibXML (DOM)   11111/s      2389%              1053%             600%               582%              400%                 31%                --
--- a/benchmark/MEMORY_FOOTPRINT
+++ b/benchmark/MEMORY_FOOTPRINT
@@ -0,0 +1,59 @@
+Memory footprints for example/ scripts comparing SOAP::WSDL, SOAP::Lite and
+XML::Compile::SOAP
+
+Results with perl-5.8.8 on Ubuntu 8.04 (x86):
+
+  PID %CPU %MEM    VSZ   RSS COMMAND
+10183 12.0  1.1  14292 11492 perl -I../lib hello.pl
+10554  7.2  0.9  12636  9828 perl hello_lite.pl
+10224 17.5  1.6  20780 17012 perl hello_compile.pl
+10287 25.0  1.1  14680 11776 perl -I../lib person.pl
+10313 24.0  1.6  21068 17312 perl person_compile.pl
+
+Summary of my perl5 (revision 5 version 8 subversion 8) configuration:
+  Platform:
+    osname=linux, osvers=2.6.15.7, archname=i486-linux-gnu-thread-multi
+    uname='linux palmer 2.6.15.7 #1 smp thu sep 7 19:42:20 utc 2006 i686 gnulinux '
+    config_args='-Dusethreads -Duselargefiles -Dccflags=-DDEBIAN -Dcccdlflags=-fPIC -Darchname=i486-linux-gnu -Dprefix=/usr -Dprivlib=/usr/share/perl/5.8 -Darchlib=/usr/lib/perl/5.8 -Dvendorprefix=/usr -Dvendorlib=/usr/share/perl5 -Dvendorarch=/usr/lib/perl5 -Dsiteprefix=/usr/local -Dsitelib=/usr/local/share/perl/5.8.8 -Dsitearch=/usr/local/lib/perl/5.8.8 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 -Dsiteman1dir=/usr/local/man/man1 -Dsiteman3dir=/usr/local/man/man3 -Dman1ext=1 -Dman3ext=3perl -Dpager=/usr/bin/sensible-pager -Uafs -Ud_csh -Ud_ualarm -Uusesfio -Uusenm -Duseshrplib -Dlibperl=libperl.so.5.8.8 -Dd_dosuid -des'
+    hint=recommended, useposix=true, d_sigaction=define
+    usethreads=define use5005threads=undef useithreads=define usemultiplicity=define
+    useperlio=define d_sfio=undef uselargefiles=define usesocks=undef
+    use64bitint=undef use64bitall=undef uselongdouble=undef
+    usemymalloc=n, bincompat5005=undef
+  Compiler:
+    cc='cc', ccflags ='-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -DDEBIAN -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64',
+    optimize='-O2',
+    cppflags='-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -DDEBIAN -fno-strict-aliasing -pipe -I/usr/local/include'
+    ccversion='', gccversion='4.2.3 20071123 (prerelease) (Ubuntu 4.2.2-3ubuntu4)', gccosandvers=''
+    intsize=4, longsize=4, ptrsize=4, doublesize=8, byteorder=1234
+    d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=12
+    ivtype='long', ivsize=4, nvtype='double', nvsize=8, Off_t='off_t', lseeksize=8
+    alignbytes=4, prototype=define
+  Linker and Libraries:
+    ld='cc', ldflags =' -L/usr/local/lib'
+    libpth=/usr/local/lib /lib /usr/lib
+    libs=-lgdbm -lgdbm_compat -ldb -ldl -lm -lpthread -lc -lcrypt
+    perllibs=-ldl -lm -lpthread -lc -lcrypt
+    libc=/lib/libc-2.6.1.so, so=so, useshrplib=true, libperl=libperl.so.5.8.8
+    gnulibc_version='2.6.1'
+  Dynamic Linking:
+    dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-Wl,-E'
+    cccdlflags='-fPIC', lddlflags='-shared -L/usr/local/lib'
+
+
+Characteristics of this binary (from libperl):
+  Compile-time options: MULTIPLICITY PERL_IMPLICIT_CONTEXT
+                        PERL_MALLOC_WRAP THREADS_HAVE_PIDS USE_ITHREADS
+                        USE_LARGE_FILES USE_PERLIO USE_REENTRANT_API
+  Built under linux
+  Compiled at Nov 27 2007 10:44:36
+  @INC:
+    /etc/perl
+    /usr/local/lib/perl/5.8.8
+    /usr/local/share/perl/5.8.8
+    /usr/lib/perl5
+    /usr/share/perl5
+    /usr/lib/perl/5.8
+    /usr/share/perl/5.8
+    /usr/local/lib/site_perl
+    .
--- a/benchmark/README
+++ b/benchmark/README
@@ -0,0 +1,77 @@
+The benchmark directory includes a bunch of benchmarks. The most notable
+ones are listed below.
+
+Comparison benchmarks for SOAP::Lite, SOAP::WSDL, SOAP::WSDL_XS, and
+XML::Compile::WSDP need all of these installed for the benchmark to
+work (building and adding to the lib path suffices). All comparison benchmarks
+only account for the client part of the respective modules - the server part
+is not benchmarked.
+
+SOAP::WSDL_XS can be obtained from the project's subversion repository at
+
+https://soap-wsdl.svn.sourceforge.net/svnroot/SOAP-WSDL/SOAP-WSDL_XS/trunk
+
+Some benchmarks expect to find the SOAP servers "cgi-bin/person.pl" and
+"cgi-bin/hello.pl" from the examples directory at
+http://localhost:81/soap-wsdl-test/person.pl and
+http://localhost:81/soap-wsdl-test/hello.pl
+
+If the web services are not set up properly, you're benchmarking error
+creation times.
+
+To set up a SOAP server using apache, add the following to your apache config:
+
+ # usually in main config
+ Listen 127.0.0.1:81
+
+ # maybe in a
+ #<VirtualHost 127.0.0.1:81> container
+ #
+ ScriptAlias /soap-wsdl-test/ /PATH_TO/SOAP-WSDL/example/cgi-bin/
+ <Directory "/PATH_TO/SOAP-WSDL/example/cgi-bin">
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+ </Directory>
+
+Using mod_perl is highly recommended to cut down benchmarking time.
+
+COMPARISON BENCHMARKS
+=====================
+
+01_expat.t
+----------
+Benchmarks XML parsing speed between XML::Simple with XML::Parser as backend,
+SOAP::Lite, SOAP::WSDL outputting objects, SOAP::WSDL outputting hash refs,
+XML::LibXML with a simple DOM walker outputting hash refs, XML::LibXML
+outputting the DOM and SOAP::WSDL_XS.
+
+No web server required.
+
+This benchmark sheds light on how much performance is - in theory - reachable
+by each approach: The XML::LibXML (Hash) benchmark converts the DOM into
+a nested hash using a recursive function. This is - basically - how
+XML::Compile works. XML::Simple uses XML::Parser's streaming
+API. SOAP::WSDL uses XML::Parser::Expat, XML::Parser's low-level backend,
+to create objects or - in the (Hash) variant - nested hashes similar to
+those created by XML::Simple.
+SOAP::WSDL_XS uses a libexpat-based XS parser to create perl objects, and
+XML::LibXML (DOM) creates a C level libxml2 DOM accessible from perl.
+
+person.pl:
+----------
+Sends a empty requests and receives a response of ca. 10kB.
+Modeled after a common enterprise setup: "Give me a list of person data sets".
+
+For this benchmark, XML parsing speed is important. XML generation speed is
+only weighted in the last two runs, and weights around 1/10 of parsing speed.
+
+hello.pl:
+---------
+Sends a request containing name and given name and politely replies
+"Hello <given name> <name>".
+An example for very short requests and responses.
+
+For this example, handling and generating small requests/responses, and
+transport speed is important. As the XML transmitted is relatively small, the
+transport layer's overhead is important.
--- a/benchmark/XSD/02_anySimpleType.t
+++ b/benchmark/XSD/02_anySimpleType.t
@@ -11,7 +11,7 @@ my $obj = SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType->new();
 timethese 10000, {
    'new' => sub { SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType->new() },
    'new + params' => sub { SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType->new({
-        value => 'Teststring'
+        value => 'Teststring',
    }) },
    'set_FOO' => sub { $obj->set_value('Test') },
 };
--- a/benchmark/XSD/03_string.t
+++ b/benchmark/XSD/03_string.t
@@ -11,8 +11,9 @@ my $obj = SOAP::WSDL::XSD::Typelib::Builtin::string->new();
 timethese 20000, {
    'new' => sub { SOAP::WSDL::XSD::Typelib::Builtin::string->new() },
    'new + params' => sub { SOAP::WSDL::XSD::Typelib::Builtin::string->new({
-        value => 'Teststring'
-    }) },
+            value => 'Teststring',
+        })
+    },
 };

 $obj->set_value('Foobar');
@@ -36,7 +37,7 @@ new + params:  1 wallclock secs ( 0.53 usr +  0.01 sys =  0.54 CPU) @ 37037.04/s
 Benchmark: timing 1000000 iterations of get_FOO, set_FOO...
   get_FOO:  2 wallclock secs ( 1.43 usr +  0.01 sys =  1.44 CPU) @ 694444.44/s (n=1000000)
   set_FOO:  0 wallclock secs ( 1.43 usr +  0.01 sys =  1.44 CPU) @ 694444.44/s (n=1000000)
-   
+

 ::Fast
 ---
@@ -47,7 +48,7 @@ Benchmark: timing 1000000 iterations of get_FOO, set_FOO...
   get_FOO:  0 wallclock secs ( 0.81 usr +  0.00 sys =  0.81 CPU) @ 1234567.90/s (n=1000000)
   set_FOO:  2 wallclock secs ( 0.87 usr +  0.01 sys =  0.88 CPU) @ 1136363.64/s (n=1000000)

-::Fast with inlined ID 
+::Fast with inlined ID
 Benchmark: timing 20000 iterations of new, new + params...
       new:  0 wallclock secs ( 0.41 usr +  0.00 sys =  0.41 CPU) @ 48780.49/s (n=20000)
 new + params:  1 wallclock secs ( 0.52 usr +  0.00 sys =  0.52 CPU) @ 38461.54/s (n=20000)
--- a/benchmark/XSD/strftime.pl
+++ b/benchmark/XSD/strftime.pl
@@ -0,0 +1,24 @@
+use Benchmark qw(cmpthese);
+use POSIX ();
+use Date::Format ();
+
+my @time_from = localtime;
+
+print "Comparing POSIX::strftime and Date::Format::strftime '%Y-%m-%dT%H:%M:%S%z'\n\n";
+print 'POSIX: ', POSIX::strftime('%Y-%m-%dT%H:%M:%S%z', @time_from), "\n";
+print 'Date::Format: ', Date::Format::strftime('%Y-%m-%dT%H:%M:%S%z', @time_from), "\n";
+
+
+cmpthese 100000, {
+    POSIX => sub { POSIX::strftime('%Y-%m-%dT%H:%M:%S%z', @time_from) },
+    'Date::Format' => sub { Date::Format::strftime('%Y-%m-%dT%H:%M:%S%z', @time_from) },
+};
+
+__END__
+
+results with perl-5.8.8 on Ubuntu 8.04 on a Thinkpad T42 (1.7GHz Dothan):
+
+                 Rate Date::Format        POSIX
+Date::Format  10684/s           --         -93%
+POSIX        153846/s        1340%           --
+
--- a/benchmark/hello.pl
+++ b/benchmark/hello.pl
@@ -1,29 +1,43 @@
 #!/usr/bin/perl -w
 use strict;
 use warnings;
+use diagnostics;
 use lib '../example/lib';
-use lib '/home/martin/workspace/SOAP-WSDL-Fast_XS/blib/lib';
-use lib '/home/martin/workspace/SOAP-WSDL-Fast_XS/blib/arch';
+use lib '../../SOAP-Lite-0.71/lib';
+use lib '/home/martin/workspace/SOAP-WSDL_XS/blib/lib';
+use lib '/home/martin/workspace/SOAP-WSDL_XS/blib/arch';
+use Data::Dumper;
 use SOAP::Lite;
 use XML::Compile::WSDL11;
 use XML::Compile::Transport::SOAPHTTP;
 use MyInterfaces::HelloWorld::HelloWorldSoap;
 use SOAP::WSDL::Deserializer::XSD_XS;
-use Benchmark qw(cmpthese);
+use Benchmark qw(cmpthese timethese);
+
+use SOAP::WSDL::Transport::HTTP;
+use SOAP::WSDL::Factory::Transport;
+SOAP::WSDL::Factory::Transport->register('http', 'SOAP::WSDL::Transport::HTTP');
+
+#my $proxy = 'http://localhost:81/soap-wsdl-test/helloworld.pl';
+my $proxy = 'http://localhost:81/soap-wsdl-test/helloworld';

 my $lite = SOAP::Lite->new(
-    proxy => 'http://localhost:81/soap-wsdl-test/helloworld.pl'
+    proxy => $proxy
 );

 $lite->on_action( sub { "urn:HelloWorld#sayHello" });
 $lite->autotype(0);

-my $soap = MyInterfaces::HelloWorld::HelloWorldSoap->new();
+my $soap = MyInterfaces::HelloWorld::HelloWorldSoap->new({
+	proxy => $proxy,
+});

-my $soap_xs = MyInterfaces::HelloWorld::HelloWorldSoap->new();
+my $soap_xs = MyInterfaces::HelloWorld::HelloWorldSoap->new({
+	proxy => $proxy,
+});
 $soap_xs->set_deserializer( SOAP::WSDL::Deserializer::XSD_XS->new() );

-my @result;
+my @result = ();;

 sub wsdl_bench {
    push @result, $soap->sayHello({
@@ -40,7 +54,12 @@ sub wsdl_xs_bench {
 }

 my $wsdl = XML::Compile::WSDL11->new('../example/wsdl/11_helloworld.wsdl');
-my $call = $wsdl->compileClient('sayHello');
+my $call = $wsdl->compileClient('sayHello',
+    sloppy_integers => 1,
+    check_values    => 0,
+    check_values    => 0,
+    validation      => 0,
+);

 sub compile_bench {
    push @result, $call->(
@@ -58,12 +77,16 @@ sub lite_bench {
    );
 }

+# give all a chance to perform first-run initializations
+compile_bench();
+lite_bench();
 wsdl_bench();
 wsdl_xs_bench();

-cmpthese 150, {
+timethese 150, {
    'SOAP::WSDL' => \&wsdl_bench,
    'SOAP::WSDL_XS' => \&wsdl_xs_bench,
    'XML::Compile' => \&compile_bench,
-    # 'SOAP::Lite' => \&lite_bench,
-}
+    'SOAP::Lite' => \&lite_bench,
+};
+
--- a/benchmark/person.pl
+++ b/benchmark/person.pl
@@ -1,5 +1,7 @@
 use lib '../lib';
 use lib '../example/lib';
+use lib '../../Class-Std-Fast/lib';
+use lib '../../SOAP-Lite-0.71/lib';
 use lib '../../SOAP-WSDL_XS/blib/lib';
 use lib '../../SOAP-WSDL_XS/blib/arch';
 use strict;
@@ -11,21 +13,86 @@ use XML::Compile::Util;
 use XML::Compile::WSDL11;
 use XML::Simple;

+use SOAP::Lite;
+use MyInterfaces::TestService::TestPort;
+
 use SOAP::WSDL::Deserializer::XSD_XS;
 use SOAP::WSDL::Factory::Deserializer;

+#
+# register SOAP::WSDL's transport as default for SOAP::WSDL and SOAP::WSDL_XS
+# - they use SOAP::Lite's SOAP::Transport::* if available
+#
+use SOAP::WSDL::Transport::HTTP;
+use SOAP::WSDL::Factory::Transport;
+SOAP::WSDL::Factory::Transport->register('http', 'SOAP::WSDL::Transport::HTTP');
+
 $XML::Simple::PREFERRED_PARSER = 'XML::Parser';
-use SOAP::Lite;

-use MyInterfaces::TestService::TestPort;
+my $person = {
+    PersonID =>         { # MyTypes::PersonID
+          ID =>  1, # int
+        },
+        Salutation => 'Salutation0', # string
+        Name =>  'Name0', # string
+        GivenName =>  'Martin', # string
+        DateOfBirth =>  '1970-01-01', # date
+        HomeAddress =>         { # MyTypes::Address
+          Street => 'Street 0', # string
+          ZIP =>  '00000', # string
+          City =>  'City0', # string
+          Country =>  'Country0', # string
+          PhoneNumber => '++499131123456', # PhoneNumber
+          MobilePhoneNumber => '++49150123456', # PhoneNumber
+        },
+        WorkAddress =>         { # MyTypes::Address
+          Street => 'Somestreet 23', # string
+          ZIP =>  '12345', # string
+          City =>  'SomeCity', # string
+          Country =>  'Germany', # string
+          PhoneNumber => '++499131123456', # PhoneNumber
+          MobilePhoneNumber => '++49150123456', # PhoneNumber
+        },
+        Contracts =>         { # MyTypes::ArrayOfContract
+          Contract => [
+          { # MyTypes::Contract
+            ContractID =>  100000, # long
+            ContractName =>  'SomeContract0', # string
+          },
+          { # MyTypes::Contract
+            ContractID =>  100001, # long
+            ContractName =>  'SomeContract1', # string
+          },
+          { # MyTypes::Contract
+            ContractID =>  100002, # long
+            ContractName =>  'SomeContract2', # string
+          },
+          { # MyTypes::Contract
+            ContractID =>  100003, # long
+            ContractName =>  'SomeContract3', # string
+          },
+          ],
+        },
+}
+;
+#
+# compile XML::Compile client with the options suggested by Mark Overmeer
+# for maximum speedup
+#
+my $compile = XML::Compile::WSDL11->new('../example/wsdl/Person.wsdl',
+    sloppy_integers => 1,
+    check_values    => 0,
+    validation      => 0,
+    ignore_facets   => 1,
+);
+
+#
+# Call all variants once to allow their first-time tasks to be done
+#

-my $compile = XML::Compile::WSDL11->new('../example/wsdl/Person.wsdl');
 my $call = $compile->compileClient('ListPerson');
 $call->({ in => undef});

-# Initialize SOAP::Lite
-my $deserializer = SOAP::Deserializer->new();
-
 # Initialize SOAP::WSDL interface
 my $soap = MyInterfaces::TestService::TestPort->new();
 # Load all classes - XML::Compile has created everything before, too
@@ -35,12 +102,20 @@ my $lite = SOAP::Lite->new()->default_ns('http://www.example.org/benchmark/')
 	->proxy('http://localhost:81/soap-wsdl-test/person.pl');
 $lite->on_action( sub { 'http://www.example.org/benchmark/ListPerson' } );

+$lite->ListPerson();
+
+my $lite_xml = SOAP::Lite->new()->default_ns('http://www.example.org/benchmark/')
+    ->proxy('http://localhost:81/soap-wsdl-test/person.pl');
+$lite_xml->on_action( sub { 'http://www.example.org/benchmark/ListPerson' } );
+$lite_xml->outputxml(1);
+
+$lite_xml->ListPerson();
+
 # # register for SOAP 1.1
 SOAP::WSDL::Factory::Deserializer->register('1.1' => 'SOAP::WSDL::Deserializer::XSD_XS' );
 my $wsdl_xs = MyInterfaces::TestService::TestPort->new();

-# trigger loading of XML Data
-my $count = 100;
+my $count = 70;
 my @data = ();
 my $n = 0;
 print "Benchmark conducted with
@@ -48,39 +123,60 @@ SOAP::Lite - $SOAP::Lite::VERSION
 SOAP::WSDL - $SOAP::WSDL::Client::VERSION
 SOAP::WSDL_XS - $SOAP::WSDL::Deserializer::XSD_XS::VERSION;
 XML::Compile::SOAP - $XML::Compile::SOAP::VERSION
+XML::Simple - $XML::Simple::VERSION
+
+XML::Simple uses XML::Parser as backend and SOAP::Lite with 
+outputxml(1) set as SOAP client.
+XML::Parser - $XML::Parser::VERSION
+
+XML::Simple is not benchmarked in run 3ff, as it is expected
+do deliver the same result.

 Benchmark $n: Store result in private variable and destroy it
 ";
 $n++;
 cmpthese $count, {
-#    'XML::Simple' => sub { my $result = XMLin( MyData::xml() )},
-    'SOAP::WSDL' => sub { my $result = $soap->ListPerson({}) },
-    'XML::Compile' => sub { my $result = $call->() },
-    'SOAP::WSDL_XS' => sub { my $result = $wsdl_xs->ListPerson({}) },
-#    'SOAP::Lite' => sub { my $result = $deserializer->deserialize( MyData::xml() )},
 	'SOAP::Lite'	=> sub { my $som = $lite->call('ListPerson') },
+    'SOAP::WSDL' => sub { my $result = $soap->ListPerson({}) },
+    'SOAP::WSDL_XS' => sub { my $result = $wsdl_xs->ListPerson({}) },
+    'XML::Compile' => sub { my $result = $call->() },
+	'XML::Simple'   => sub { my $result = XMLin( $lite_xml->call('ListPerson')) },
 };

 print "\nBenchmark $n: Push result on list\n";
 $n++;
 cmpthese $count, {
-#    'XML::Simple' => sub { push @data, XMLin( MyData::xml() )},
-    'SOAP::WSDL' => sub { push @data, $soap->ListPerson({}) },
-    'XML::Compile' => sub { push @data, $call->() },
+    'SOAP::Lite'    => sub { push @data, $lite->call('ListPerson') },
+    'SOAP::WSDL'    => sub { push @data, $soap->ListPerson({}) },
    'SOAP::WSDL_XS' => sub { push @data, $wsdl_xs->ListPerson({}) },
-#    'SOAP::Lite' => sub { push @data, $deserializer->deserialize( MyData::xml() )}
-	'SOAP::Lite'	=> sub { push @data, $lite->call('ListPerson') },
+    'XML::Compile'  => sub { push @data, $call->() },
+	'XML::Simple'   => sub { push @data, XMLin( $lite_xml->call('ListPerson')) },
 };

@data = ();
 print "\nBenchmark $n: Play it again, Sam\n";
-
+$n++;
 cmpthese $count, {
-#    'XML::Simple' => sub { push @data, XMLin( MyData::xml() )},
-    'SOAP::WSDL' => sub { push @data, $soap->ListPerson({}) },
+
+    'SOAP::WSDL'    => sub { push @data, $soap->ListPerson({}) },
    'SOAP::WSDL_XS' => sub { push @data, $wsdl_xs->ListPerson({}) },
-    'XML::Compile' => sub { push @data, $call->() },
-#    'SOAP::Lite' => sub { push @data, $deserializer->deserialize( MyData::xml() )}
-	'SOAP::Lite'	=> sub { push @data, $lite->call('ListPerson') },
+    'XML::Compile'  => sub { push @data, $call->() },
+    'SOAP::Lite'    => sub { push @data, $lite->call('ListPerson') },
+};
+
+print "\nBenchmark $n: ca. 1kB request - result destroyed immediately\n";
+$n++;
+cmpthese $count, {
+    'SOAP::WSDL'    => sub { my $result = $soap->ListPerson({ in => $person }) },
+    'SOAP::WSDL_XS' => sub { my $result = $wsdl_xs->ListPerson({ in => $person }) },
+    'XML::Compile'  => sub { my $result = $call->({ in => $person }) },
+};
+
+print "\nBenchmark $n: ca. 1kB request - push result on list\n";
+$n++;
+cmpthese $count, {
+    'SOAP::WSDL'    => sub { push @data, $soap->ListPerson({ in => $person }) },
+    'SOAP::WSDL_XS' => sub { push @data, $wsdl_xs->ListPerson({ in => $person }) },
+    'XML::Compile'  => sub { push @data, $call->({ in => $person }) },
 };

--- a/benchmark/person_profile.pl
+++ b/benchmark/person_profile.pl
@@ -3,9 +3,17 @@ use lib '../example/lib';
 use lib '../../SOAP-WSDL_XS/blib/lib';
 use lib '../../SOAP-WSDL_XS/blib/arch';
 use strict;
+# use Benchmark;
+use SOAP::WSDL::Deserializer::XSD_XS;
+use SOAP::WSDL::Factory::Deserializer;
+# # register for SOAP 1.1
+SOAP::WSDL::Factory::Deserializer->register('1.1' => 'SOAP::WSDL::Deserializer::XSD_XS' );

 use MyInterfaces::TestService::TestPort;

 my $soap = MyInterfaces::TestService::TestPort->new();
 # Load all classes - XML::Compile has created everything before, too
-for (1..100) { $soap->ListPerson({}) };
+if (@ARGV) { print $soap->ListPerson({}) }
+else {
+	 $soap->ListPerson({})
+}
--- a/benchmark/person_single.pl
+++ b/benchmark/person_single.pl
--- a/bin/wsdl2perl.pl
+++ b/bin/wsdl2perl.pl
@@ -10,15 +10,18 @@ use Term::ReadKey;

 my %opt = (
  url => '',
-  prefix => undef,
-  type_prefix => 'MyTypes',
-  element_prefix => 'MyElements',
-  typemap_prefix => 'MyTypemaps',
-  interface_prefix => 'MyInterfaces',
+  prefix            => 'My',
+  attribute_prefix  => undef,
+  type_prefix       => undef,
+  element_prefix    => undef,
+  typemap_prefix    => undef,
+  interface_prefix  => undef,
+  server_prefix     => undef,
  base_path => 'lib/',
  proxy => undef,
  generator => 'XSD',
  server => 0,
+  namespace => 0,
 );

 {   # a block just to scope "no warnings"
@@ -34,12 +37,14 @@ my %opt = (
            ReadMode 1;
            $user =  ReadLine();
            ReadMode 0;
+            chomp $user;
        };
        if (not $password = delete $opt{password}) {
            print 'Password:';
            ReadMode 2;
-            $user = ReadLine;
+            $password = ReadLine;
            ReadMode 0;
+            chomp $password;
        };
        return ($user, $password);
    };
@@ -48,10 +53,12 @@ my %opt = (
 GetOptions(\%opt,
  qw(
    prefix|p=s
+    attribute_prefix|a=s
    type_prefix|t=s
    element_prefix|e=s
    typemap_prefix|m=s
    interface_prefix|i=s
+    server_prefix|sp=s
    base_path|b=s
    typemap_include|mi=s
    help|h
@@ -60,7 +67,8 @@ GetOptions(\%opt,
    user=s
    password=s
    generator=s
-    server
+    server|s
+    namespaces|n
  )
 );

@@ -83,6 +91,20 @@ my $parser = SOAP::WSDL::Expat::WSDLParser->new({
    user_agent => $lwp,
 });

+# resolve the default prefix options
+map {
+    my $opt_key = $_;
+    if ( $opt_key =~ / (\w+) _prefix $/xms # relevant option
+            && !$opt{ $opt_key }           # that hasn't already been explicitly set
+        )
+    {
+        my $prefix_type = $1;
+        $opt{ $opt_key } = $opt{prefix} .                           # My
+                           ucfirst( $prefix_type ) .                # Typemap
+                           ( $prefix_type eq 'server' ? '' : 's' ); # s
+    }
+} keys %opt;
+
 my $definitions = $parser->parse_uri( $url );

 my %typemap = ();
@@ -103,12 +125,22 @@ if (%typemap) {
    }
 };

-$generator->set_type_prefix( $opt{ type_prefix }) if $generator->can('set_type_prefix');
-$generator->set_typemap_prefix( $opt{ typemap_prefix }) if $generator->can('set_typemap_prefix');
-$generator->set_element_prefix($opt{ element_prefix }) if $generator->can('set_element_prefix');
-$generator->set_interface_prefix($opt{ interface_prefix }) if $generator->can('set_interface_prefix');
-$generator->set_OUTPUT_PATH($opt{ base_path }) if $generator->can('set_OUTPUT_PATH');
-$generator->set_definitions($definitions) if $generator->can('set_definitions');
+$generator->set_attribute_prefix( $opt{ attribute_prefix })
+    if $generator->can('set_attribute_prefix');
+$generator->set_type_prefix( $opt{ type_prefix })
+    if $generator->can('set_type_prefix');
+$generator->set_typemap_prefix( $opt{ typemap_prefix })
+    if $generator->can('set_typemap_prefix');
+$generator->set_element_prefix($opt{ element_prefix })
+    if $generator->can('set_element_prefix');
+$generator->set_interface_prefix($opt{ interface_prefix })
+    if $generator->can('set_interface_prefix');
+$generator->set_server_prefix($opt{ server_prefix })
+    if $generator->can('set_server_prefix');
+$generator->set_OUTPUT_PATH($opt{ base_path })
+    if $generator->can('set_OUTPUT_PATH');
+$generator->set_definitions($definitions)
+    if $generator->can('set_definitions');
 # $generator->set_wsdl($xml) if $generator->can('set_wsdl');

 # start with typelib, as errors will most likely occur here...
@@ -132,7 +164,11 @@ wsdl2perl.pl - create perl bindings for SOAP webservices.

 NAME            SHORT  DESCRITPION
 ----------------------------------------------------------------------------
- prefix            p   Prefix for both type and element classes.
+ prefix            p   Prefix for all generated classes. If you set "-p=Foo",
+                       you will get "FooAttributes", "FooTypes", 
+					   "FooElements" and so on.
+ attribute_prefix  a   Prefix for XML attribute classes.
+                       Default: MyAttributes
 type_prefix       t   Prefix for type classes.
                       Default: MyTypes
 element_prefix    e   Prefix for element classes.
@@ -141,6 +177,8 @@ wsdl2perl.pl - create perl bindings for SOAP webservices.
                       Default: MyTypemaps
 interface_prefix  i   Prefix for interface classes.
                       Default: MyInterfaces
+ server_prefix     sp  Prefix for server classes.
+                       Default: MyServer
 base_path         b   Path to create classes in.
                       Default: .
 typemap_include   mi  File to include in typemap. Must eval() to a valid
--- a/example/cgi-bin/helloworld.pl
+++ b/example/cgi-bin/helloworld.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+package main;
 use strict;
 use warnings;
 use lib '../../lib';
@@ -33,7 +34,7 @@ in examples/wsdl/helloworld.wsdl
 Before using this script, you should secure your webserver. The easiest way
 to do so is to let it listen to 127.0.0.1 only.

-Then make a ScriptAlias named /soap-wsdl-test/ pointing at the directory 
+Then make a ScriptAlias named /soap-wsdl-test/ pointing at the directory
 this file lies in.

 For my apache, it looks like this:
--- a/example/cgi-bin/person.pl
+++ b/example/cgi-bin/person.pl
@@ -2,7 +2,7 @@
 package main;
 use strict;
 use warnings;
-#use lib qw(../lib ../../lib);
+use lib qw(../lib ../../lib);
 use MyElements::ListPersonResponse;
 use MyServer::TestService::TestPort;
 my $server = MyServer::TestService::TestPort->new({
--- a/example/lib/MyElements/CountCookies.pm
+++ b/example/lib/MyElements/CountCookies.pm
@@ -1,3 +1,4 @@
+
 package MyElements::CountCookies;
 use strict;
 use warnings;
@@ -17,13 +18,30 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::ComplexType
 );

+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+



 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -36,6 +54,21 @@ MyElements::CountCookies
 Perl data type class for the XML Schema defined element
 CountCookies from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/CountCookiesResponse.pm
+++ b/example/lib/MyElements/CountCookiesResponse.pm
@@ -1,3 +1,4 @@
+
 package MyElements::CountCookiesResponse;
 use strict;
 use warnings;
@@ -16,6 +17,14 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);

@@ -26,14 +35,18 @@ Class::Std::initialize();
 my %CountCookiesResult_of :ATTR(:get<CountCookiesResult>);

 __PACKAGE__->_factory(
-    [ qw(
-        CountCookiesResult
+    [ qw(        CountCookiesResult
+
    ) ],
    {
-        CountCookiesResult => \%CountCookiesResult_of,
+        'CountCookiesResult' => \%CountCookiesResult_of,
    },
    {
-        CountCookiesResult => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'CountCookiesResult' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'CountCookiesResult' => 'CountCookiesResult',
    }
 );

@@ -44,11 +57,12 @@ __PACKAGE__->_factory(



-
 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -61,6 +75,30 @@ MyElements::CountCookiesResponse
 Perl data type class for the XML Schema defined element
 CountCookiesResponse from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CountCookiesResult
+
+ $element->set_CountCookiesResult($data);
+ $element->get_CountCookiesResult();
+
+
+
+
+=back
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/GetFortuneCookie.pm
+++ b/example/lib/MyElements/GetFortuneCookie.pm
@@ -1,3 +1,4 @@
+
 package MyElements::GetFortuneCookie;
 use strict;
 use warnings;
@@ -17,13 +18,30 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::ComplexType
 );

+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+



 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -36,6 +54,21 @@ MyElements::GetFortuneCookie
 Perl data type class for the XML Schema defined element
 GetFortuneCookie from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/GetFortuneCookieResponse.pm
+++ b/example/lib/MyElements/GetFortuneCookieResponse.pm
@@ -1,3 +1,4 @@
+
 package MyElements::GetFortuneCookieResponse;
 use strict;
 use warnings;
@@ -16,6 +17,14 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);

@@ -26,14 +35,18 @@ Class::Std::initialize();
 my %GetFortuneCookieResult_of :ATTR(:get<GetFortuneCookieResult>);

 __PACKAGE__->_factory(
-    [ qw(
-        GetFortuneCookieResult
+    [ qw(        GetFortuneCookieResult
+
    ) ],
    {
-        GetFortuneCookieResult => \%GetFortuneCookieResult_of,
+        'GetFortuneCookieResult' => \%GetFortuneCookieResult_of,
    },
    {
-        GetFortuneCookieResult => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'GetFortuneCookieResult' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'GetFortuneCookieResult' => 'GetFortuneCookieResult',
    }
 );

@@ -44,11 +57,12 @@ __PACKAGE__->_factory(



-
 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -61,6 +75,30 @@ MyElements::GetFortuneCookieResponse
 Perl data type class for the XML Schema defined element
 GetFortuneCookieResponse from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * GetFortuneCookieResult
+
+ $element->set_GetFortuneCookieResult($data);
+ $element->get_GetFortuneCookieResult();
+
+
+
+
+=back
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/GetSpecificCookie.pm
+++ b/example/lib/MyElements/GetSpecificCookie.pm
@@ -1,3 +1,4 @@
+
 package MyElements::GetSpecificCookie;
 use strict;
 use warnings;
@@ -16,6 +17,14 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);

@@ -26,14 +35,18 @@ Class::Std::initialize();
 my %index_of :ATTR(:get<index>);

 __PACKAGE__->_factory(
-    [ qw(
-        index
+    [ qw(        index
+
    ) ],
    {
-        index => \%index_of,
+        'index' => \%index_of,
    },
    {
-        index => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'index' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'index' => 'index',
    }
 );

@@ -44,11 +57,12 @@ __PACKAGE__->_factory(



-
 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -61,6 +75,30 @@ MyElements::GetSpecificCookie
 Perl data type class for the XML Schema defined element
 GetSpecificCookie from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * index
+
+ $element->set_index($data);
+ $element->get_index();
+
+
+
+
+=back
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/GetSpecificCookieResponse.pm
+++ b/example/lib/MyElements/GetSpecificCookieResponse.pm
@@ -1,3 +1,4 @@
+
 package MyElements::GetSpecificCookieResponse;
 use strict;
 use warnings;
@@ -16,6 +17,14 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);

@@ -26,14 +35,18 @@ Class::Std::initialize();
 my %GetSpecificCookieResult_of :ATTR(:get<GetSpecificCookieResult>);

 __PACKAGE__->_factory(
-    [ qw(
-        GetSpecificCookieResult
+    [ qw(        GetSpecificCookieResult
+
    ) ],
    {
-        GetSpecificCookieResult => \%GetSpecificCookieResult_of,
+        'GetSpecificCookieResult' => \%GetSpecificCookieResult_of,
    },
    {
-        GetSpecificCookieResult => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'GetSpecificCookieResult' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'GetSpecificCookieResult' => 'GetSpecificCookieResult',
    }
 );

@@ -44,11 +57,12 @@ __PACKAGE__->_factory(



-
 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -61,6 +75,30 @@ MyElements::GetSpecificCookieResponse
 Perl data type class for the XML Schema defined element
 GetSpecificCookieResponse from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * GetSpecificCookieResult
+
+ $element->set_GetSpecificCookieResult($data);
+ $element->get_GetSpecificCookieResult();
+
+
+
+
+=back
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/int.pm
+++ b/example/lib/MyElements/int.pm
@@ -1,3 +1,4 @@
+
 package MyElements::int;
 use strict;
 use warnings;
@@ -14,14 +15,12 @@ __PACKAGE__->__set_ref();
 use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::Builtin::int
-
 );

+}

-} # end of BLOCK
 1;

-# __END__

 =pod

@@ -34,6 +33,12 @@ MyElements::int
 Perl data type class for the XML Schema defined element
 int from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/readNodeCount.pm
+++ b/example/lib/MyElements/readNodeCount.pm
@@ -1,3 +1,4 @@
+
 package MyElements::readNodeCount;
 use strict;
 use warnings;
@@ -17,13 +18,30 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::ComplexType
 );

+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+



 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -36,6 +54,21 @@ MyElements::readNodeCount
 Perl data type class for the XML Schema defined element
 readNodeCount from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/readNodeCountResponse.pm
+++ b/example/lib/MyElements/readNodeCountResponse.pm
@@ -1,3 +1,4 @@
+
 package MyElements::readNodeCountResponse;
 use strict;
 use warnings;
@@ -16,6 +17,14 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);

@@ -26,14 +35,18 @@ Class::Std::initialize();
 my %readNodeCountResult_of :ATTR(:get<readNodeCountResult>);

 __PACKAGE__->_factory(
-    [ qw(
-        readNodeCountResult
+    [ qw(        readNodeCountResult
+
    ) ],
    {
-        readNodeCountResult => \%readNodeCountResult_of,
+        'readNodeCountResult' => \%readNodeCountResult_of,
    },
    {
-        readNodeCountResult => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'readNodeCountResult' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'readNodeCountResult' => 'readNodeCountResult',
    }
 );

@@ -44,11 +57,12 @@ __PACKAGE__->_factory(



-
 } # end of BLOCK
+
+
+
 1;

-# __END__

 =pod

@@ -61,6 +75,30 @@ MyElements::readNodeCountResponse
 Perl data type class for the XML Schema defined element
 readNodeCountResponse from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.

+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * readNodeCountResult
+
+ $element->set_readNodeCountResult($data);
+ $element->get_readNodeCountResult();
+
+
+
+
+=back
+
+
 =head1 METHODS

 =head2 new
--- a/example/lib/MyElements/string.pm
+++ b/example/lib/MyElements/string.pm
@@ -1,27 +1,26 @@
+
 package MyElements::string;
 use strict;
 use warnings;

 { # BLOCK to scope variables

-sub get_xmlns { 'http://www.webserviceX.NET' }
+sub get_xmlns { 'http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx' }

 __PACKAGE__->__set_name('string');
-__PACKAGE__->__set_nillable(true);
+__PACKAGE__->__set_nillable(1);
 __PACKAGE__->__set_minOccurs();
 __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::Builtin::string
-
 );

+}

-} # end of BLOCK
 1;

-# __END__

 =pod

@@ -32,7 +31,13 @@ MyElements::string
 =head1 DESCRIPTION

 Perl data type class for the XML Schema defined element
-string from the namespace http://www.webserviceX.NET.
+string from the namespace http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx.
+
+
+
+
+
+

 =head1 METHODS

--- a/example/lib/MyInterfaces/FullerData_x0020_Fortune_x0020_Cookie/FullerData_x0020_Fortune_x0020_CookieSoap.pm
+++ b/example/lib/MyInterfaces/FullerData_x0020_Fortune_x0020_Cookie/FullerData_x0020_Fortune_x0020_CookieSoap.pm
@@ -13,6 +13,8 @@ sub START {
    $_[0]->set_proxy('http://www.fullerdata.com/FortuneCookie/FortuneCookie.asmx') if not $_[2]->{proxy};
    $_[0]->set_class_resolver('MyTypemaps::FullerData_x0020_Fortune_x0020_Cookie')
        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
 }

 sub readNodeCount {
@@ -24,10 +26,11 @@ sub readNodeCount {
        style => 'document',
        body => {
            
-           'use' => 'literal',
-            namespace => '',
-            encodingStyle => '',
-            parts => [qw( MyElements::readNodeCount )],
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( MyElements::readNodeCount )],
        },
        header => {
            
@@ -38,6 +41,7 @@ sub readNodeCount {
    }, $body, $header);
 }

+
 sub GetFortuneCookie {
    my ($self, $body, $header) = @_;
    die "GetFortuneCookie must be called as object method (\$self is <$self>)" if not blessed($self);
@@ -47,10 +51,11 @@ sub GetFortuneCookie {
        style => 'document',
        body => {
            
-           'use' => 'literal',
-            namespace => '',
-            encodingStyle => '',
-            parts => [qw( MyElements::GetFortuneCookie )],
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( MyElements::GetFortuneCookie )],
        },
        header => {
            
@@ -61,6 +66,7 @@ sub GetFortuneCookie {
    }, $body, $header);
 }

+
 sub CountCookies {
    my ($self, $body, $header) = @_;
    die "CountCookies must be called as object method (\$self is <$self>)" if not blessed($self);
@@ -70,10 +76,11 @@ sub CountCookies {
        style => 'document',
        body => {
            
-           'use' => 'literal',
-            namespace => '',
-            encodingStyle => '',
-            parts => [qw( MyElements::CountCookies )],
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( MyElements::CountCookies )],
        },
        header => {
            
@@ -84,6 +91,7 @@ sub CountCookies {
    }, $body, $header);
 }

+
 sub GetSpecificCookie {
    my ($self, $body, $header) = @_;
    die "GetSpecificCookie must be called as object method (\$self is <$self>)" if not blessed($self);
@@ -93,10 +101,11 @@ sub GetSpecificCookie {
        style => 'document',
        body => {
            
-           'use' => 'literal',
-            namespace => '',
-            encodingStyle => '',
-            parts => [qw( MyElements::GetSpecificCookie )],
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( MyElements::GetSpecificCookie )],
        },
        header => {
            
@@ -109,6 +118,7 @@ sub GetSpecificCookie {



+
 1;


@@ -119,21 +129,20 @@ __END__

 =head1 NAME

-
 MyInterfaces::FullerData_x0020_Fortune_x0020_Cookie::FullerData_x0020_Fortune_x0020_CookieSoap - SOAP Interface for the FullerData_x0020_Fortune_x0020_Cookie Web Service

 =head1 SYNOPSIS

 use MyInterfaces::FullerData_x0020_Fortune_x0020_Cookie::FullerData_x0020_Fortune_x0020_CookieSoap;
 my $interface = MyInterfaces::FullerData_x0020_Fortune_x0020_Cookie::FullerData_x0020_Fortune_x0020_CookieSoap->new();
- 
+
 my $response;
 $response = $interface->readNodeCount();
 $response = $interface->GetFortuneCookie();
 $response = $interface->CountCookies();
 $response = $interface->GetSpecificCookie();

- 
+

 =head1 DESCRIPTION

@@ -168,42 +177,58 @@ of the corresponding class can be passed instead of the marked hash ref.
 You may pass any combination of objects, hash and list refs to these
 methods, as long as you meet the structure.

+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+


 =head3 readNodeCount

 Display the number of nodes specified in fortune XML document

- $interface->readNodeCount(,,
+Returns a L<MyElements::readNodeCountResponse|MyElements::readNodeCountResponse> object.
+
+ $response = $interface->readNodeCount(,,
 );
- 
+
 =head3 GetFortuneCookie

 Get a random fortune cookie from the XML document

- $interface->GetFortuneCookie(,,
+Returns a L<MyElements::GetFortuneCookieResponse|MyElements::GetFortuneCookieResponse> object.
+
+ $response = $interface->GetFortuneCookie(,,
 );
- 
+
 =head3 CountCookies

 Count the actual number of nodes in the XML document of fortunes

- $interface->CountCookies(,,
+Returns a L<MyElements::CountCookiesResponse|MyElements::CountCookiesResponse> object.
+
+ $response = $interface->CountCookies(,,
 );
- 
+
 =head3 GetSpecificCookie

 Get a specific cookie by the XML node number

- $interface->GetSpecificCookie(  {
+Returns a L<MyElements::GetSpecificCookieResponse|MyElements::GetSpecificCookieResponse> object.
+
+ $response = $interface->GetSpecificCookie( {
    index =>  $some_value, # int
  },,
 );
- 
+


 =head1 AUTHOR

-Generated by SOAP::WSDL on Sun Dec 16 19:58:30 2007
+Generated by SOAP::WSDL on Wed Dec  3 22:05:20 2008

-=pod
+=cut
--- a/example/lib/MyServer/HelloWorld/HelloWorldSoap.pm
+++ b/example/lib/MyServer/HelloWorld/HelloWorldSoap.pm
@@ -15,12 +15,11 @@ my %dispatch_to :ATTR(:name<dispatch_to>);

 my $action_map_ref = {
    'urn:HelloWorld#sayHello' => 'sayHello',
-
 };

 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,
@@ -30,7 +29,7 @@ sub START {
 }

 sub handle {
-    $transport_of{ ${ $_[0] } }->handle();
+    $transport_of{ ${ $_[0] } }->handle(@_[1..$#_]);
 }

 1;
@@ -76,7 +75,7 @@ located at http://localhost:81/soap-wsdl-test/helloworld.pl.

 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
@@ -94,9 +93,9 @@ class.
    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  MyElements::sayHelloResponse->new(  {
    sayHelloResult =>  $some_value, # string
  },
--- a/example/lib/MyTypemaps/FullerData_x0020_Fortune_x0020_Cookie.pm
+++ b/example/lib/MyTypemaps/FullerData_x0020_Fortune_x0020_Cookie.pm
@@ -1,3 +1,4 @@
+
 package MyTypemaps::FullerData_x0020_Fortune_x0020_Cookie;
 use strict;
 use warnings;
@@ -38,11 +39,13 @@ sub get_typemap {

 __END__

+__END__
+
 =pod

 =head1 NAME

-MyTypemaps::FullerData_x0020_Fortune_x0020_Cookie; - typemap for ::FullerData_x0020_Fortune_x0020_Cookie;
+MyTypemaps::FullerData_x0020_Fortune_x0020_Cookie - typemap for FullerData_x0020_Fortune_x0020_Cookie

 =head1 DESCRIPTION

--- a/lib/SOAP/WSDL.pm
+++ b/lib/SOAP/WSDL.pm
@@ -10,15 +10,14 @@ use Carp;
 use Scalar::Util qw(blessed);
 use SOAP::WSDL::Client;
 use SOAP::WSDL::Expat::WSDLParser;
-use Class::Std::Fast;
+use Class::Std::Fast constructor => 'none';
 use SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType;
 use LWP::UserAgent;

-our $VERSION= '2.00_31';
+use version; our $VERSION = qv('2.00.06');

 my %no_dispatch_of      :ATTR(:name<no_dispatch>);
 my %wsdl_of             :ATTR(:name<wsdl>);
-my %proxy_of            :ATTR(:name<proxy>);
 my %autotype_of         :ATTR(:name<autotype>);
 my %outputxml_of        :ATTR(:name<outputxml> :default<0>);
 my %outputtree_of       :ATTR(:name<outputtree>);
@@ -42,7 +41,6 @@ my %LOOKUP = (
  no_dispatch           => \%no_dispatch_of,
  class_resolver        => \%class_resolver_of,
  wsdl                  => \%wsdl_of,
-  proxy                 => \%proxy_of,
  autotype              => \%autotype_of,
  outputxml             => \%outputxml_of,
  outputtree            => \%outputtree_of,
@@ -94,12 +92,30 @@ for my $method (keys %LOOKUP ) {
        }

        my $ident = ident $self;
-        $self->wsdlinit() if ($wsdl_of{ $ident });
        $client_of{ $ident } = SOAP::WSDL::Client->new();
+        $self->wsdlinit() if ($wsdl_of{ $ident });
        return $self;
    }
 }

+sub set_proxy {
+    my $self = shift;
+    return $self->get_client()->set_proxy(@_);
+}
+
+sub get_proxy {
+    my $self = shift;
+    return $self->get_client()->get_proxy();
+}
+
+sub proxy {
+    my $self = shift;
+    if (@_) {
+        return $self->set_proxy(@_);
+    }
+    return $self->get_proxy();
+}
+
 sub wsdlinit {
    my ($self, %opt) = @_;
    my $ident = ident $self;
@@ -132,6 +148,15 @@ sub wsdlinit {

    $servicename_of{ $ident } = $opt{servicename} if $opt{servicename};
    $portname_of{ $ident } = $opt{portname} if $opt{portname};
+
+    $self->_wsdl_init_methods();
+
+    # pass-through keep_alive if we need it...
+    $self->get_client()->set_proxy(
+        $port_of{ $ident }->first_address()->get_location(),
+        $keep_alive_of{ $ident } ? (keep_alive => 1) : (),
+    );
+
    return $self;
 } ## end sub wsdlinit

@@ -151,6 +176,7 @@ sub _wsdl_get_port :PRIVATE  {
        ? $service_of{ $ident }->get_port( $ns, $portname_of{ $ident } )
        : $port_of{ $ident } = $service_of{ $ident }->get_port()->[ 0 ];
 }
+
 sub _wsdl_get_binding :PRIVATE {
    my $self = shift;
    my $ident = ident $self;
@@ -160,6 +186,7 @@ sub _wsdl_get_binding :PRIVATE {
        or croak "no binding found for ", $port->get_binding();
    return $binding_of{ $ident };
 }
+
 sub _wsdl_get_portType :PRIVATE {
    my $self    = shift;
    my $ident   = ident $self;
@@ -169,6 +196,7 @@ sub _wsdl_get_portType :PRIVATE {
        or croak "cannot find portType for " . $binding->get_type();
    return $porttype_of{ $ident };
 }
+
 sub _wsdl_init_methods :PRIVATE {
    my $self = shift;
    my $ident = ident $self;
@@ -240,6 +268,10 @@ sub _wsdl_init_methods :PRIVATE {
    return $method_info_of{ $ident };
 }

+# on_action is a no-op and just here for compatibility reasons.
+# It returns the first parameter to allow method chaining.
+sub on_action { return shift }
+
 sub call {
    my ($self, $method, @data_from) = @_;
    my $ident = ${ $self };
@@ -255,12 +287,6 @@ sub call {

    my $client = $client_of{ $ident };

-    # pass-through keep_alive if we need it...
-    $client->set_proxy( $proxy_of{ $ident }
-        || $port_of{ $ident }->first_address()->get_location(),
-        $keep_alive_of{ $ident } ? (keep_alive => 1) : (),
-    );
-
    $client->set_no_dispatch( $no_dispatch_of{ $ident } );
    $client->set_outputxml( $outputxml_of{ $ident } ? 1 : 0 );

@@ -273,7 +299,7 @@ sub call {
      && ( ! $no_dispatch_of{ $ident } ) ) {
        require SOAP::WSDL::Deserializer::SOM;
        $client->set_deserializer( SOAP::WSDL::Deserializer::SOM->new() );
-    };
+    }

    my $method_info = $method_info_of{ $ident }->{ $method };

@@ -330,6 +356,17 @@ read L<SOAP::WSDL::Manual>.
 For using an interpreting (thus slow and somewhat troublesome) WSDL based
 SOAP client, which mimics L<SOAP::Lite|SOAP::Lite>'s API, read on.

+Creating Interface classes is the recommended usage.
+
+Did I say you should create interface classes following the steps in
+L<SOAP::WSDL::Manual>?
+
+If you're migrating from earlier versions of SOAP::WSDL, you should read the
+MIGRATING documentation.
+
+The stuff below is for users of the 1.2x SOAP::WSDL series. All others,
+please refer to L<SOAP::WSDL::Manual>
+
 =head1 SYNOPSIS

 my $soap = SOAP::WSDL->new(
@@ -501,7 +538,7 @@ it's content.
 The object tree has two main functions: It knows how to serialize data passed
 as hash ref, and how to render the WSDL elements found into perl classes.

-Yup your're right, there's a builting code generation facility. Read
+Yup you're right; there's a builtin code generation facility. Read
 L<SOAP::WSDL::Manual> for using it.

 =item * no_dispatch
@@ -522,6 +559,34 @@ You may pass the servicename and portname as attributes to wsdlinit, though.

 =back

+=head1 Differences to previous versions
+
+The following functionality is no longer supported:
+
+=head2 Operation overloading
+
+The SOAP standard allows operation overloading - that is, you may specify
+SOAP operations with more than one message. The client/server than can
+choose which message to send. This SOAP feature is usually used similar
+to the use of methods with different argument lists in C++.
+
+Operation overloading is no longer supported. The WS-I Basic profile does
+not operation overloading. The same functionality as operation overloading
+can be obtained by using a choice declaration in the XML Schema.
+
+=head2 readable
+
+Readable has no effect any more. If you need readable debug output, copy the
+SOAP message to your favorite XML editor and run the source format command.
+Outputting readable XML requires lots of programming for little use: The
+resulting XMl is still quite unreadable.
+
+=head2 on_action
+
+Setting on_action is not required any more, the appropriate value is
+automatically taken from the WSDL. on_action is a no-op, and is just here
+for compatibility issues.
+
 =head1 Differences to SOAP::Lite

 =head2 readable
@@ -562,7 +627,7 @@ See L<class_resolver|class_resolver> above.

 =item * Hash refs

-This is for convnience: A single hash ref containing the content of the
+This is for convenience: A single hash ref containing the content of the
 SOAP body.

 =item * xml
@@ -604,6 +669,18 @@ details.

 =over

+=item * $obj == undef does not work in perl 5.8.6 and perl 5.8.7
+
+Due to some strange behaviour in perl 5.8.6 and perl 5.8.7, stringification
+overloading is not triggered during comparison with undef.
+
+While this is probably harmless in most cases, it's important to know that
+you need to do
+
+ defined( $obj->get_value() )
+
+to check for undef values in simpleType objects.
+
 =item * perl 5.8.0 or higher required

 SOAP::WSDL needs perl 5.8.0 or higher. This is due to a bug in perls
@@ -617,24 +694,26 @@ If you want this changed, email me a copy of the specs, please.

 =item * Incomplete XML Schema definitions support

-XML Schema attribute definitions are not supported yet.
+This section describes the limitations of SOAP::WSDL, that is the interpreting
+SOAP client. For limitations of L<wsdl2perl.pl|wsdl2perl.pl> generated
+SOAP clients, see L<SOAP::WSDL::Manual::XSD>.

-Importing external definitions is not supported yet.
+XML Schema attribute definitions are not supported in interpreting mode.

-The following XML Schema definitions varieties are not supported:
+The following XML Schema definitions varieties are not supported in
+interpreting mod:

 group
- union
 simpleContent

 The following XML Schema definition content model is only partially
-supported:
+supported in interpreting mode:

 complexContent - only restriction variety supported

 See L<SOAP::WSDL::Manual::XSD> for details.

-=item * Serialization of hash refs dos not work for ambiguos values
+=item * Serialization of hash refs does not work for ambiguous values

 If you have list elements with multiple occurences allowed, SOAP::WSDL
 has no means of finding out which variant you meant.
@@ -644,17 +723,17 @@ Passing in item => [1,2,3] could serialize to
 <item>1 2</item><item>3</item>
 <item>1</item><item>2 3</item>

-Ambiguos data can be avoided by providing data as objects.
+Ambiguous data can be avoided by providing data as objects.

 =item * XML Schema facets

-Almost no XML schema facets are implemented yet. The only facets
+Almost no XML schema facets are implemented. The only facets
 currently implemented are:

 fixed
 default

-The following facets have no influence yet:
+The following facets have no influence:

 minLength
 maxLength
@@ -678,10 +757,10 @@ The following facets have no influence yet:
 Full featured SOAP-library, little WSDL support. Supports rpc-encoded style
 only. Many protocols supported.

-=item * L<XML::Compile::WSDL|XML::Compile::WSDL> / L<XML::Compile::SOAP|XML::Compile::SOAP>
+=item * L<XML::Compile::SOAP|XML::Compile::SOAP>

 Creates parser/generator functions for SOAP messages. Includes SOAP Client
-and Server implementatios.
+and Server implementations. Can validate XML messages.

 You might want to give it a try, especially if you need to adhere very
 closely to the XML Schema / WSDL specs.
@@ -712,20 +791,35 @@ became v1.23)

 David Bussenschutt, Damian A. Martinez Gelabert, Dennis S. Hennen, Dan Horne,
 Peter Orvos, Mark Overmeer, Jon Robens, Isidro Vila Verde and Glenn Wood
-spotted bugs and/or suggested improvements in the 1.2x releases.
+(in alphabetical order) spotted bugs and/or suggested improvements in
+the 1.2x releases.
+
+JT Justman and Noah Robin provided early feedback and bug reports for
+the 2.xx pre-releases.
+
+Adam Kennedy checked and suggested improvements on metadata and dependencies
+in the 2.xx pre-releases.

 Andreas 'ac0v' Specht constantly asked for better performance.

-JT Justman provided early feedback for the 2.xx pre-releases.
+Matt S. Trout encouraged me "to get a non-dev-release out."

-Numerous people sent me their real-world WSDL files for testing. Thank you.
+CPAN Testers provided most valuable (automated) feedback. Thanks a lot.
+
+Numerous people sent me their real-world WSDL files and error reports for
+testing. Thank you.
+
+Noah Robin contributed lots of documentation fixes, and the mod_perl server,
+and eventually joined SOAP::WSDL's developement. Thanks.
+
+Mark Overmeer wrote XML::Compile::SOAP - competition is good for business.

 Paul Kulchenko and Byrne Reese wrote and maintained SOAP::Lite and
 thus provided a base (and counterpart) for SOAP::WSDL.

 =head1 LICENSE AND COPYRIGHT

-Copyright 2004-2007 Martin Kutter.
+Copyright 2004-2008 Martin Kutter.

 This file is part of SOAP-WSDL. You may distribute/modify it under
 the same terms as perl itself
@@ -736,10 +830,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 524 $
+ $Rev: 755 $
 $LastChangedBy: kutterma $
- $Id: WSDL.pm 524 2008-02-10 23:24:43Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL.pm $
+ $Id: WSDL.pm 755 2008-12-03 21:36:54Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL.pm $

 =cut
-
--- a/lib/SOAP/WSDL/Base.pm
+++ b/lib/SOAP/WSDL/Base.pm
@@ -1,43 +1,64 @@
 package SOAP::WSDL::Base;
-use strict;
-use warnings;
+use strict; use warnings;
 use Class::Std::Fast::Storable;
-use List::Util qw(first);
+use List::Util;
+use Scalar::Util;
 use Carp qw(croak carp confess);

-our $VERSION='2.00_27';
+use version; our $VERSION = qv('2.00.05');

-my %id_of :ATTR(:name<id> :default<()>);
-my %name_of :ATTR(:name<name> :default<()>);
-my %documentation_of :ATTR(:name<documentation> :default<()>);
-my %targetNamespace_of :ATTR(:name<targetNamespace> :default<()>);
-my %xmlns_of :ATTR(:name<xmlns> :default<{}>);
-my %parent_of :ATTR(:name<parent> :default<()>);
+my %id_of               :ATTR(:name<id> :default<()>);
+my %lang_of             :ATTR(:name<lang> :default<()>);
+my %name_of             :ATTR(:name<name> :default<()>);
+my %namespace_of        :ATTR(:name<namespace> :default<()>);
+my %documentation_of    :ATTR(:name<documentation> :default<()>);
+my %annotation_of       :ATTR(:name<annotation> :default<()>);
+my %targetNamespace_of  :ATTR(:name<targetNamespace> :default<()>);
+my %xmlns_of            :ATTR(:name<xmlns> :default<{}>);
+my %parent_of           :ATTR(:get<parent> :default<()>);
+
+my %namespaces_of       :ATTR(:default<{}>);
+
+sub namespaces {
+    return shift->get_xmlns();
+}
+
+sub BUILD {
+    my ($self, $ident, $arg_ref) = @_;
+    if (defined $arg_ref->{ parent }) {
+        $parent_of{ $ident } = delete $arg_ref->{ parent },
+        Scalar::Util::weaken($parent_of{ $ident });
+    }
+}

 sub START {
    my ($self, $ident, $arg_ref) = @_;
-    $xmlns_of{ $ident }->{ '#default' } = $self->get_xmlns()->{ '#default' };
+    $xmlns_of{ $ident }->{ 'xml' } = 'http://www.w3.org/XML/1998/namespace';
+    $namespaces_of{ $ident }->{ '#default' } = $self->get_xmlns()->{ '#default' };
+    $namespaces_of{ $ident }->{ 'xml' } = 'http://www.w3.org/XML/1998/namespace';
 }

-sub DEMOLISH {
-  my $self = shift;
-  # delete upward references
-  delete $parent_of{ ident $self };
-  return;
+#
+# set_parent is hand-implemented to break up (weaken) the circular reference
+# between an object and it's parent
+#
+sub set_parent {
+    $parent_of{ ${ $_[0]} } = $_[1];
+    Scalar::Util::weaken($parent_of{ ${ $_[0]} });
 }

-sub STORABLE_freeze_pre :CUMULATIVE {};
-sub STORABLE_freeze_post :CUMULATIVE {};
-sub STORABLE_thaw_pre :CUMULATIVE {};
-sub STORABLE_thaw_post :CUMULATIVE { return $_[0] };
-
+# _accept is here to be called by visitor.
+# The visitor pattern is a level of indirection - here the visitor calls
+# $object->_accept($visitor) on each object, which in turn calls
+# $visitor->visit_$class( $object ) where $class is the object's class.
+#
 sub _accept {
    my $self = shift;
    my $class = ref $self;
    $class =~ s{ \A SOAP::WSDL:: }{}xms;
    $class =~ s{ (:? :: ) }{_}gxms;
    my $method = "visit_$class";
-    no strict qw(refs); ## no critic ProhibitNoStrict
+    no strict qw(refs);
    return shift->$method( $self );
 }

@@ -52,13 +73,12 @@ sub AUTOMETHOD {
    if ($subname =~s{^push_}{}xms) {
        my $getter = "get_$subname";
        my $setter = "set_$subname";
-        ## Checking here is paranoid - will fail fatally if
-        ## there is no setter...
-        ## And we would have to check getters, too.
-        ## Maybe do it the Conway way via the Symbol table...
-        ## ... can is way slow...
+        # Checking here is paranoid - will fail fatally if there is no setter.
+        # And we would have to check getters, too.
+        # Maybe do it the Conway way via the Symbol table...
+        # ... can is way slow...
        return sub {
-            no strict qw(refs);                 ## no critic ProhibitNoStrict
+            no strict qw(refs);
            my $old_value = $self->$getter();
            # Listify if not a list ref
            $old_value = $old_value ? [ $old_value ] : [] if not ref $old_value;
@@ -72,7 +92,7 @@ sub AUTOMETHOD {
    elsif ($subname =~s {^find_}{get_}xms) {
        @values = @{ $values[0] } if ref $values[0] eq 'ARRAY';
        return sub {
-            return first {
+            return List::Util::first {
                $_->get_targetNamespace() eq $values[0] &&
                $_->get_name() eq $values[1]
            }
@@ -87,20 +107,30 @@ sub AUTOMETHOD {
            return $result_ref->[0];
        };
    }
-    confess "$subname not found in class " . ref $self;
+
+    return;
 }

 sub init {
    my ($self, @args) = @_;
-    foreach my $value (@args)
-    {
+    foreach my $value (@args) {
        croak @args if (not defined ($value->{ Name }));
+
        if ($value->{ Name } =~m{^xmlns\:}xms) {
            # add namespaces
            $xmlns_of{ ident $self }->{ $value->{ LocalName } } = $value->{ Value };
            next;
        }

+        # check for namespae-qualified attributes.
+        # neither XML Schema, nor WSDL1.1, nor the SOAP binding allow
+        # namespace-qualified attribute names
+        my ($ns, $localname) = split /\|/, $value->{ Name };
+        if ($ns) {
+            warn "found unrecognised attribute \{$ns}$localname (ignored)";
+            next;
+        }
+
        my $name = $value->{ LocalName };
        my $method = "set_$name";
        $self->$method( $value->{ Value } );
@@ -109,23 +139,29 @@ sub init {
 }

 sub expand {
-    my ($self, , $qname) = @_;
-    my $ns_of = $self->get_xmlns();
+    my ($self, $qname) = @_;
+    my $ns_of = $self->namespaces();
+    my $parent;
    if (not $qname=~m{:}xm) {
+        if (defined $ns_of->{ '#default' }) {
+            # TODO check. Returning the targetNamespace for the default ns
+            # is probably wrong
+            #return $self->get_targetNamespace(), $qname;
+            return $ns_of->{ '#default' }, $qname;
+        }
+        if ($parent = $self->get_parent()) {
+            return $parent->expand($qname);
+        }
        die "un-prefixed element name <$qname> found, but no default namespace set\n"
-            if not defined $ns_of->{ '#default' };
-        return $ns_of->{ '#default' }, $qname;
    }

    my ($prefix, $localname) = split /:/x, $qname;

-
    return ($ns_of->{ $prefix }, $localname) if ($ns_of->{ $prefix });
-
-    if (my $parent = $self->get_parent()) {
+    if ($parent = $self->get_parent()) {
        return $parent->expand($qname);
    }
-    confess "unbound prefix $prefix found for $prefix:$localname. Bound prefixes are"
+    croak "unbound prefix $prefix found for $prefix:$localname. Bound prefixes are "
        . join(', ', keys %{ $ns_of });
 }
 sub _expand;
--- a/lib/SOAP/WSDL/Binding.pm
+++ b/lib/SOAP/WSDL/Binding.pm
@@ -2,9 +2,11 @@ package SOAP::WSDL::Binding;
 use strict;
 use warnings;
 use Class::Std::Fast::Storable;
-use List::Util qw(first);
+
 use base qw(SOAP::WSDL::Base);

+use version; our $VERSION = qv('2.00.05');
+
 my %operation_of    :ATTR(:name<operation> :default<()>);
 my %type_of         :ATTR(:name<type> :default<()>);
 my %transport_of    :ATTR(:name<transport> :default<()>);
--- a/lib/SOAP/WSDL/Client.pm
+++ b/lib/SOAP/WSDL/Client.pm
@@ -11,18 +11,19 @@ use SOAP::WSDL::Factory::Serializer;
 use SOAP::WSDL::Factory::Transport;
 use SOAP::WSDL::Expat::MessageParser;

-our $VERSION = '2.00_27';
+use version; our $VERSION = qv('2.00.05');

 my %class_resolver_of   :ATTR(:name<class_resolver> :default<()>);
 my %no_dispatch_of      :ATTR(:name<no_dispatch>    :default<()>);
+my %prefix_of           :ATTR(:name<prefix>         :default<()>);
 my %outputxml_of        :ATTR(:name<outputxml>      :default<()>);
 my %transport_of        :ATTR(:name<transport>      :default<()>);
 my %endpoint_of         :ATTR(:name<endpoint>       :default<()>);

-my %soap_version_of     :ATTR(:get<soap_version>    :init_attr<soap_version> :default<'1.1'>);
+my %soap_version_of     :ATTR(:get<soap_version>    :init_attr<soap_version> :default<1.1>);

 my %on_action_of        :ATTR(:name<on_action>      :default<()>);
-my %content_type_of     :ATTR(:name<content_type>   :default<text/xml; charset=utf8>);  #/#trick editors
+my %content_type_of     :ATTR(:name<content_type>   :default<text/xml; charset=utf-8>);  #/#trick editors
 my %serializer_of       :ATTR(:name<serializer>     :default<()>);
 my %deserializer_of     :ATTR(:name<deserializer>   :default<()>);

@@ -61,7 +62,7 @@ sub set_proxy {
 }

 sub set_soap_version {
-    my $ident = ident shift;
+    my $ident = ${ $_[0] };

    # remember old value to return it later - Class::Std does so, too
    my $soap_version = $soap_version_of{ $ident };
@@ -71,14 +72,14 @@ sub set_soap_version {
    delete $serializer_of{ $ident };
    delete $deserializer_of{ $ident };

-    $soap_version_of{ $ident } = shift;
+    $soap_version_of{ $ident } = $_[1];

    return $soap_version;
 }

 # Mimic SOAP::Lite's behaviour for getter/setter routines
 SUBFACTORY: {
-    for (qw(class_resolver no_dispatch outputxml proxy)) {
+    for (qw(class_resolver no_dispatch outputxml proxy prefix)) {
        my $setter = "set_$_";
        my $getter = "get_$_";
        no strict qw(refs);     ## no critic ProhibitNoStrict
@@ -94,7 +95,7 @@ SUBFACTORY: {

 sub call {
    my ($self, $method, @data_from) = @_;
-    my $ident = ident $self;
+    my $ident = ${ $self };

    # the only valid idiom for calling a method with both a header and a body
    # is
@@ -124,6 +125,7 @@ sub call {
        method => $operation,
        body => $data,
        header => $header,
+        options => {prefix => $prefix_of{ $ident }},
    });

    return $envelope if $self->no_dispatch();
@@ -259,19 +261,52 @@ You probably should not use a character encoding different from utf8:
 SOAP::WSDL::Client will not convert the request into a different encoding
 (yet).

-To leave out the encoding, just set the content type without appendet charset
-like in
+To leave out the encoding, just set the content type without appending charset
+like this:

- text/xml
+  $soap->set_content_type('text/xml');

 Default:

 text/xml; charset: utf8

+=head3 set_prefix
+
+ $soap->set_prefix('ns2');
+
+If set, alters the serialization of the request XML such that the supplied value is used as a namespace prefix for SOAP method calls. By way of example, the default XML serialization returns something like this:
+
+    <?xml version="1.0"?>
+    <SOAP-ENV:Envelope
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+      <SOAP-ENV:Body>
+        <getElementId xmlns="http://services.exmaple.org/">
+          <elementId>12345</elementId>
+        </getElementId>
+      </SOAP-ENV:Body>
+    </SOAP-ENV:Envelope>
+
+If the sample set_prefix() call above is used prior to calling your SOAP method, the XML serialization returns this instead:
+
+    <?xml version="1.0"?>
+    <SOAP-ENV:Envelope
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:ns2="http://services.example.org/">
+      <SOAP-ENV:Body>
+        <ns2:getElementId>
+          <elementId>12345</elementId>
+        </ns2:getElementId>
+      </SOAP-ENV:Body>
+    </SOAP-ENV:Envelope>
+
+This is useful in cases where, for instance, one is communicating with a JAX L<https://jax-ws.dev.java.net/> webservice, which tends to understand the latter but not the former. Note that this implementation is currently limited to a single additional namespace; if you require multiple custom namespaces, you should probably look into creating your own serializer.
+
 =head2 Features different from SOAP::Lite

 SOAP::WSDL does not aim to be a complete replacement for SOAP::Lite - the
-SOAP::Lite module has it's strengths and weaknesses and SOAP::WSDL is
+SOAP::Lite module has its strengths and weaknesses and SOAP::WSDL is
 designed as a cure for the weakness of little WSDL support - nothing more,
 nothing less.

@@ -283,7 +318,7 @@ A few things are quite different from SOAP::Lite, though:

 =head3 SOAP request data

-SOAP request data may either be given as message object, or as hash ref (in
+SOAP request data may either be given as message object, or as a hash ref (in
 which case it will automatically be encoded into a message object).

 =head3 Return values
@@ -303,7 +338,7 @@ The fault object is a SOAP1.1 fault object of the following
 C<SOAP::WSDL::SOAP::Typelib::Fault11>.

 SOAP::WSDL::SOAP::Typelib::Fault11 objects are false in boolean context, so
-you can just do something like
+you can just do something like:

 my $result = $soap->call($method, $data);

@@ -321,7 +356,7 @@ to true. SOAP::WSDL::Client returns the complete XML response.

 =head3 Auto-Dispatching

-SOAP::WSDL::Client does B<does not> support auto-dispatching.
+SOAP::WSDL::Client B<does not> support auto-dispatching.

 This is on purpose: You may easily create interface classes by using
 SOAP::WSDL::Client and implementing something like
@@ -360,10 +395,10 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 455 $
+ $Rev: 744 $
 $LastChangedBy: kutterma $
- $Id: Client.pm 455 2007-12-14 15:50:16Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $
+ $Id: Client.pm 744 2008-10-15 16:58:45Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $

 =cut

--- a/lib/SOAP/WSDL/Client/Base.pm
+++ b/lib/SOAP/WSDL/Client/Base.pm
@@ -4,25 +4,25 @@ use warnings;
 use base 'SOAP::WSDL::Client';
 use Scalar::Util qw(blessed);

-our $VERSION = '2.00_25';
+use version; our $VERSION = qv('2.00.05');

 sub call {
    my ($self, $method, $body, $header) = @_;

    # Treat non-objects special
    if (not blessed $body) {
-        
+
        # make sure there's something sensible in our body data
        $body = {} if not defined $body;
        $body = ref $body eq 'ARRAY' ? $body : [ $body ];

        my @body_from = @{ $body }; # make a copy

-        # build list of parts as objects initialized with 
+        # build list of parts as objects initialized with
        # parameters given
        my @part_from = ();
        foreach my $class (@{ $method->{ body }->{ parts } }) {
-            eval "require $class" || die $@;
+            eval "require $class" || die $@;    ## no critic (ProhibitStringyEval)
            push @part_from, $class->new(shift(@body_from) || {});
        }

@@ -33,10 +33,10 @@ sub call {
    # if we have a header
    if (%{ $method->{ header } }) {

-        # trat non object special - as above, but only for one
+        # treat non object special - as above, but only for one
        if (not blessed $header) {
            my $class = $method->{ header }->{ parts }->[0];
-            eval "require $class" || die $@;
+            eval "require $class" || die $@;    ## no critic (ProhibitStringyEval)
            $header = $class->new($header);
        }
    }
@@ -65,6 +65,13 @@ SOAP::WSDL::Client::Base - Factory class for WSDL-based SOAP access
 Factory class for creating interface classes. Should probably be renamed to
 SOAP::WSDL::Factory::Interface...

+=head1 METHODS
+
+=head2 call
+
+Abstraction layer method between the generated interfaces and
+L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
 =head1 LICENSE AND COPYRIGHT

 Copyright 2004-2007 Martin Kutter.
@@ -78,9 +85,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 501 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: Base.pm 501 2008-01-26 20:23:32Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client/Base.pm $
+ $Id: Base.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client/Base.pm $

 =cut
--- a/lib/SOAP/WSDL/Definitions.pm
+++ b/lib/SOAP/WSDL/Definitions.pm
@@ -1,30 +1,26 @@
 package SOAP::WSDL::Definitions;
-use utf8;
 use strict;
 use warnings;
-use Carp;
-use File::Basename;
-use File::Path;
 use List::Util qw(first);
 use Class::Std::Fast::Storable;
 use base qw(SOAP::WSDL::Base);

-our $VERSION='2.00_27';
+use version; our $VERSION = qv('2.00.05');

-my %types_of    :ATTR(:name<types>      :default<[]>);
-my %message_of  :ATTR(:name<message>    :default<()>);
-my %portType_of :ATTR(:name<portType>   :default<()>);
-my %binding_of  :ATTR(:name<binding>    :default<()>);
-my %service_of  :ATTR(:name<service>    :default<()>);
-my %namespace_of  :ATTR(:name<namespace> :default<()>);
+my %types_of        :ATTR(:name<types>      :default<[]>);
+my %message_of      :ATTR(:name<message>    :default<[]>);
+my %portType_of     :ATTR(:name<portType>   :default<[]>);
+my %binding_of      :ATTR(:name<binding>    :default<[]>);
+my %service_of      :ATTR(:name<service>    :default<[]>);
+my %namespace_of    :ATTR(:name<namespace>  :default<()>);

 # must be attr for Class::Std::Fast::Storable
-my %attributes_of :ATTR();
-%attributes_of = (
-    binding => \%binding_of,
-    message => \%message_of,
-    portType => \%portType_of,
-    service => \%service_of,
+#my %attributes_of :ATTR();
+my %attributes_of = (
+    binding     => \%binding_of,
+    message     => \%message_of,
+    portType    => \%portType_of,
+    service     => \%service_of,
 );

 # Function factory - we could be writing this method for all %attribute
@@ -44,6 +40,7 @@ BLOCK: {
  }
 }

+
 1;

 =pod
@@ -72,7 +69,7 @@ Returns the service matching the namespace/localname pair passed as arguments.
 Accessors/Mutators for accessing / setting the E<gt>bindingE<lt> child
 element(s).

-=head2 find_service
+=head2 find_binding

 Returns the binding matching the namespace/localname pair passed as arguments.

@@ -94,7 +91,7 @@ Returns the portType matching the namespace/localname pair passed as arguments.
 Accessors/Mutators for accessing / setting the E<gt>messageE<lt> child
 element(s).

-=head2 find_service
+=head2 find_message

 Returns the message matching the namespace/localname pair passed as arguments.

@@ -118,10 +115,10 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 477 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: Definitions.pm 477 2007-12-24 10:23:52Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Definitions.pm $
+ $Id: Definitions.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Definitions.pm $

 =cut

--- a/lib/SOAP/WSDL/Deserializer/Hash.pm
+++ b/lib/SOAP/WSDL/Deserializer/Hash.pm
@@ -8,7 +8,7 @@ use SOAP::WSDL::Expat::Message2Hash;
 use SOAP::WSDL::Factory::Deserializer;
 SOAP::WSDL::Factory::Deserializer->register( '1.1', __PACKAGE__ );

-our $VERSION='2.00_25';
+use version; our $VERSION = qv('2.00.05');

 sub BUILD {
    my ($self, $ident, $args_of_ref) = @_;
@@ -54,7 +54,7 @@ SOAP::WSDL::Deserializer::Hash - Deserializer SOAP messages into perl hash refs

 use SOAP::WSDL;
 use SOAP::WSDL::Deserializer::Hash;
- 
+
 =head1 DESCRIPTION

 Deserializer for creating perl hash refs as result of a SOAP call.
@@ -139,9 +139,20 @@ a parse error appears

 =back

+=head1 METHODS
+
+=head2 deserialize
+
+Deserializes the message.
+
+=head2 generate_fault
+
+Generates a L<SOAP::WSDL::SOAP::Typelib::Fault11|SOAP::WSDL::SOAP::Typelib::Fault11>
+object and returns it.
+
 =head1 LICENSE AND COPYRIGHT

-Copyright 2004-2007 Martin Kutter.
+Copyright 2004-2008 Martin Kutter.

 This file is part of SOAP-WSDL. You may distribute/modify it under
 the same terms as perl itself.
@@ -152,9 +163,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 427 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: Hash.pm 427 2007-12-02 22:20:24Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/Hash.pm $
+ $Id: Hash.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/Hash.pm $

 =cut
--- a/lib/SOAP/WSDL/Deserializer/SOM.pm
+++ b/lib/SOAP/WSDL/Deserializer/SOM.pm
@@ -2,7 +2,7 @@ package SOAP::WSDL::Deserializer::SOM;
 use strict;
 use warnings;

-our $VERSION = '2.00_24';
+use version; our $VERSION = qv('2.00.05');
 our @ISA;

 eval {
@@ -13,6 +13,18 @@ or die "Cannot load SOAP::Lite.
 Cannot deserialize to SOM object without SOAP::Lite.
 Please install SOAP::Lite.";

+sub deserialize {
+    my $self = shift;
+    my $result = eval { $self->SUPER::deserialize(@_) };
+    if ($@) {
+        return SOAP::Fault->new(
+            faultactor => 'soap:Server',
+            faultstring => $@,
+        );
+    }
+    return $result;
+}
+
 sub generate_fault {
    my ($self, $args_from_ref) = @_;
    # code, message, detail, actor
@@ -37,7 +49,7 @@ SOAP::WSDL::Deserializer::SOM - Deserializer SOAP messages into SOM objects
 use SOAP::WSDL::Deserializer::SOM;
 use SOAP::WSDL::Factory::Deserializer;
 SOAP::WSDL::Factory::Deserializer->register( '1.1', __PACKAGE__ );
- 
+
 =head1 DESCRIPTION

 Deserializer for creating SOAP::Lite's SOM object as result of a SOAP call.
@@ -66,13 +78,24 @@ This may be XML including mixed content, attachements and other XML data not
 SOAP::WSDL::Deserializer::SOM is a subclass of L<SOAP::Deserializer|SOAP::Deserializer>
 from the L<SOAP::Lite|SOAP::Lite> package.

+=head1 METHODS
+
+=head2 deserialize
+
+Deserializes a XML sting into a SOAP::SOM object. Returns a SOAP::Fault object
+on deserialization errors.
+
+=head2 generate_fault
+
+Dies with a SOAP::Fault object.
+
 =head1 USAGE

-SOAP::WSDL::Deserializer will not auroregister itself - to use it for a particular
+SOAP::WSDL::Deserializer will not autoregister itself - to use it for a particular
 SOAP version just use the following lines:

 my $soap_version = '1.1'; # or '1.2', further versions may appear.
- 
+
 use SOAP::WSDL::Deserializer::SOM;
 use SOAP::WSDL::Factory::Deserializer;
 SOAP::WSDL::Factory::Deserializer->register( $soap_version, __PACKAGE__ );
@@ -85,8 +108,8 @@ SOAP version just use the following lines:

 =item * No on_fault handler

-You cannot specify what to do when an error occurs - SOAP::WSDL will die
-with a SOAP::Fault object on transport errors.
+You cannot specify what to do when an error occurs - SOAP::WSDL will return
+a SOAP::Fault object on transport errors.

 =back

@@ -99,6 +122,9 @@ with a SOAP::Fault object on transport errors.
 SOAP::WSDL::Deserializer::SOM will die with a SOAP::Fault object on calls
 to generate_fault.

+This also means that a SOAP::Fault may be thrown as exception when using
+
+
 =back

 =head1 LICENSE AND COPYRIGHT
@@ -114,9 +140,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 391 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: SOM.pm 391 2007-11-17 21:56:13Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/SOM.pm $
+ $Id: SOM.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/SOM.pm $

 =cut
--- a/lib/SOAP/WSDL/Deserializer/XSD.pm
+++ b/lib/SOAP/WSDL/Deserializer/XSD.pm
@@ -5,7 +5,7 @@ use Class::Std::Fast::Storable;
 use SOAP::WSDL::SOAP::Typelib::Fault11;
 use SOAP::WSDL::Expat::MessageParser;

-our $VERSION='2.00_25';
+use version; our $VERSION = qv('2.00.05');

 my %class_resolver_of :ATTR(:name<class_resolver> :default<()>);

@@ -25,7 +25,7 @@ sub deserialize {

    $parser_of{ ${ $self } } = SOAP::WSDL::Expat::MessageParser->new()
        if not $parser_of{ ${ $self } };
-    $parser_of{ ${ $self } }->class_resolver( $class_resolver_of{ ident $self } );
+    $parser_of{ ${ $self } }->class_resolver( $class_resolver_of{ ${ $self } } );
    eval { $parser_of{ ${ $self } }->parse_string( $content ) };
    if ($@) {
        return $self->generate_fault({
@@ -72,7 +72,7 @@ Usually you don't need to do anything to use this package - it's the default
 deserializer for SOAP::WSDL::Client and interface classes generated by
 SOAP::WSDL.

-Is you want to use the XSD serializer from SOAP::WSDL, set the outputtree()
+If you want to use the XSD serializer from SOAP::WSDL, set the outputtree()
 property and provide a class_resolver.

 =head1 METHODS
@@ -99,9 +99,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 501 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: XSD.pm 501 2008-01-26 20:23:32Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/XSD.pm $
+ $Id: XSD.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/XSD.pm $

 =cut
--- a/lib/SOAP/WSDL/Expat/Base.pm
+++ b/lib/SOAP/WSDL/Expat/Base.pm
@@ -6,29 +6,62 @@ use XML::Parser::Expat;

 # TODO: convert to Class::Std::Fast based class - hash based classes suck.

-our $VERSION = '2.00_27';
+use version; our $VERSION = qv('2.00.05');

 sub new {
    my ($class, $arg_ref) = @_;
-    my $self = {};
+    my $self = {
+        data => undef,
+    };
    bless $self, $class;

    $self->set_user_agent($arg_ref->{ user_agent })
        if $arg_ref->{ user_agent };
+    $self->{ parsed } = $arg_ref->{ parsed } if $arg_ref->{ parsed };

    return $self;
 }

+sub clone {
+    my $self = shift;
+    my $class = ref $self;
+    my $clone = $class->new($self);
+    return $clone;
+}
+
 sub set_uri { $_[0]->{ uri } = $_[1]; }
 sub get_uri { return $_[0]->{ uri }; }

 sub set_user_agent { $_[0]->{ user_agent } = $_[1]; }
 sub get_user_agent { return $_[0]->{ user_agent }; }

+# Mark a URI as "already parsed"
+sub set_parsed {
+    my ($self, $uri) = @_;
+    $self->{ parsed }->{ $uri } = 1;
+    return;
+}

+
+# returns true if a specific URI has already been parsed
+sub is_parsed {
+    my ($self, $uri) = @_;
+    return exists $self->{ parsed }->{ $uri };
+}
+
+
+# parse a URI. This is the preferred parsing method for WSDL files, as it's
+# the only one allowing automatic import resolution
 sub parse_uri {
    my $self = shift;
    my $uri = shift;
+
+    if ($self->is_parsed($uri)){
+        warn "$uri already imported; ignoring it.\n";
+        return;
+    }
+    $self->set_parsed($uri);
+
    $self->set_uri( $uri );

    if (not $self->{ user_agent }) {
@@ -37,7 +70,6 @@ sub parse_uri {
    }

    my $response = $self->{ user_agent }->get($uri);
-
    die $response->message() if $response->code() ne '200';
    return $self->parse( $response->content() );
 }
@@ -48,6 +80,7 @@ sub parse {
        $_[0]->{ parser }->release();
    };
    $_[0]->{ parser }->xpcroak( $@ ) if $@;
+    delete $_[0]->{ parser };
    return $_[0]->{ data };
 }

@@ -57,6 +90,7 @@ sub parsefile {
        $_[0]->{ parser }->release();
    };
    $_[0]->{ parser }->xpcroak( $@ ) if $@;
+    delete $_[0]->{ parser };
    return $_[0]->{ data };
 }

--- a/lib/SOAP/WSDL/Expat/Message2Hash.pm
+++ b/lib/SOAP/WSDL/Expat/Message2Hash.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use base qw(SOAP::WSDL::Expat::Base);

-our $VERSION = '2.00_27';
+use version; our $VERSION = qv('2.00.05');

 sub _initialize {
    my ($self, $parser) = @_;
@@ -21,7 +21,7 @@ sub _initialize {
    my ($_element, $_method,
        $_class, $_parser, %_attrs) = ();

-    no strict qw(refs);
+    # no strict qw(refs);
    $parser->setHandlers(
        Start => sub {
            push @$list, $current;
--- a/lib/SOAP/WSDL/Expat/MessageParser.pm
+++ b/lib/SOAP/WSDL/Expat/MessageParser.pm
@@ -1,19 +1,20 @@
 #!/usr/bin/perl
 package SOAP::WSDL::Expat::MessageParser;
-use strict;
-use warnings;
-use Carp qw(croak confess);
-
-our $VERSION = q{2.00_27};
+use strict; use warnings;

 use SOAP::WSDL::XSD::Typelib::Builtin;
 use SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType;

 use base qw(SOAP::WSDL::Expat::Base);

-require Class::Std::Fast;
+BEGIN { require Class::Std::Fast };
+
+use version; our $VERSION = qv('2.00.05');
+
+# GLOBALS
 my $OBJECT_CACHE_REF = Class::Std::Fast::OBJECT_CACHE_REF();

+# keep track of classes loaded
 my %LOADED_OF = ();

 sub new {
@@ -24,7 +25,12 @@ sub new {
    };

    bless $self, $class;
-    $self->load_classes() if ($args->{ class_resolver });
+
+    # could be written as && - but Devel::Cover doesn't like that
+    if ($args->{ class_resolver }) {
+        $self->load_classes()
+            if ! exists $LOADED_OF{ $self->{ class_resolver } };
+    }
    return $self;
 }

@@ -32,7 +38,8 @@ sub class_resolver {
    my $self = shift;
    if (@_) {
        $self->{ class_resolver } = shift;
-        $self->load_classes();
+        $self->load_classes()
+            if ! exists $LOADED_OF{ $self->{ class_resolver } };
    }
    return $self->{ class_resolver };
 }
@@ -42,7 +49,8 @@ sub load_classes {

    return if $LOADED_OF{ $self->{ class_resolver } };

-    for (values %{ $self->{ class_resolver }->get_typemap }) {
+    # requires sorting to make sub-packages load after their parent
+    for (sort values %{ $self->{ class_resolver }->get_typemap }) {
        no strict qw(refs);
        my $class = $_;

@@ -50,9 +58,10 @@ sub load_classes {
        next if $class eq '__SKIP__';
        next if defined *{ "$class\::" }; # check if namespace exists

+        # Require takes a bareword or a file name - we have to take
+        # the filname road here...
        $class =~s{ :: }{/}xmsg;
-        $class .= '.pm';
-        require $class;
+        require "$class.pm";    ## no critic (RequireBarewordIncludes)
    }
    $LOADED_OF{ $self->{ class_resolver } } = 1;
 }
@@ -102,16 +111,12 @@ sub _initialize {
        : ();

    # use "globals" for speed
-    my ($_prefix, $_method,
-        $_class, $_leaf) = ();
+    my ($_prefix, $_method, $_class, $_leaf) = ();

    my $char_handler = sub {
-            return if (!$_leaf);    # we only want characters in leaf nodes
-
-            $characters .= $_[1];
-#                if $_[1] =~m{ [^\s] }xms;
-
-            return;
+        return if (!$_leaf);    # we only want characters in leaf nodes
+        $characters .= $_[1];   # add to characters
+        return;                 # return void
    };

    no strict qw(refs);
@@ -162,6 +167,9 @@ sub _initialize {
            # (circumventing constructor) here.
            # That's dirty, but fast.
            #
+            # TODO: check whether this is faster under all perls - there's
+            # strange benchmark results...
+            #
            # The alternative would read:
            # $current = $_class->new({ @_[2..$#_] });
            #
@@ -172,9 +180,24 @@ sub _initialize {
            }

            # set attributes if there are any
-            $current->attr({ @_[2..$#_] }) if (@_ > 2);
-
+            ATTR: {
+                if (@_ > 2) {
+                    # die Data::Dumper::Dumper(@_[2..$#_]);
+                    my %attr = @_[2..$#_];
+                    if (my $nil = delete $attr{nil}) {
+                        # TODO: check namespace
+                        if ($nil && $nil ne 'false') {
+                            undef $characters;
+                            last ATTR if not (%attr);
+                        }
+                    }
+                    $current->attr(\%attr);
+                }
+            }
            $depth++;
+
+            # TODO: Skip content of anyType / any stuff
+
            return;
        },

@@ -194,13 +217,6 @@ sub _initialize {

            $depth--;

-            # return if there's only one elment - can't set it in parent ;-)
-            # but set as root element if we don't have one already.
-            if (not defined $list->[-1]) {
-                $self->{ data } = $current if (not exists $self->{ data });
-                return;
-            };
-
            # we only set character values in leaf nodes
            if ($_leaf) {
                # Use dirty but fast access via global variables.
@@ -210,16 +226,30 @@ sub _initialize {
                # $current->set_value( $characters ) if (length($characters));
                #
                $SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType::___value
-                    ->{ $$current } = $characters if $characters =~m{ [^\s] }xms;
+                    ->{ $$current } = $characters
+                        if defined $characters && defined $current; # =~m{ [^\s] }xms;
            }

            # empty characters
            $characters = q{};

+            # return if there's only one elment - can't set it in parent ;-)
+            # but set as root element if we don't have one already.
+            if (not defined $list->[-1]) {
+                $self->{ data } = $current if (not exists $self->{ data });
+                return;
+            };
+
            # set appropriate attribute in last element
            # multiple values must be implemented in base class
+            # TODO check if hash access is faster
            # $_method = "add_$_localname";
            $_method = "add_$_[1]";
+            #
+            # fixup XML names for perl names
+            #
+            $_method =~s{\.}{__}xg;
+            $_method =~s{\-}{_}xg;
            $list->[-1]->$_method( $current );

            $current = pop @$list;          # step up in object hierarchy
@@ -293,11 +323,11 @@ the same terms as perl itself

 =head1 Repository information

- $Id: $
+ $Id: MessageParser.pm 728 2008-07-13 19:28:50Z kutterma $

- $LastChangedDate: 2008-02-02 10:19:45 +0100 (Sa, 02 Feb 2008) $
- $LastChangedRevision: 516 $
+ $LastChangedDate: 2008-07-13 21:28:50 +0200 (So, 13 Jul 2008) $
+ $LastChangedRevision: 728 $
 $LastChangedBy: kutterma $

- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageParser.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageParser.pm $

--- a/lib/SOAP/WSDL/Expat/MessageStreamParser.pm
+++ b/lib/SOAP/WSDL/Expat/MessageStreamParser.pm
@@ -6,7 +6,7 @@ use XML::Parser::Expat;
 use SOAP::WSDL::Expat::MessageParser;
 use base qw(SOAP::WSDL::Expat::MessageParser);

-our $VERSION = '2.00_24';
+use version; our $VERSION = qv('2.00.05');

 sub parse_start {
    my $self = shift;
@@ -43,7 +43,7 @@ SOAP::WSDL::Expat::MessageStreamParser - Convert SOAP messages to custom object
 # process response while it comes in, trying to read 32k chunks.
 $lwp->request( $request, sub { $chunk_parser->parse_more($_[0]) } , 32468 );
 $chunk_parser->parse_done();
- 
+
 my $obj = $parser->get_data();

 =head1 DESCRIPTION
@@ -69,9 +69,9 @@ the same terms as perl itself

 =head1 REPOSITORY INFORMATION

- $Rev: 477 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: MessageStreamParser.pm 477 2007-12-24 10:23:52Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageStreamParser.pm $
- 
+ $Id: MessageStreamParser.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageStreamParser.pm $
+
 =cut
--- a/lib/SOAP/WSDL/Expat/WSDLParser.pm
+++ b/lib/SOAP/WSDL/Expat/WSDLParser.pm
@@ -1,59 +1,137 @@
-package SOAP::WSDL::Expat::WSDLParser;
+package SOAP::WSDL::Expat::WSDLParser;
 use strict;
 use warnings;
 use Carp;
 use SOAP::WSDL::TypeLookup;
 use base qw(SOAP::WSDL::Expat::Base);

-our $VERSION = q{2.00_31};
+use version; our $VERSION = qv('2.00.05');
+
+#
+# Import child elements of a WSDL / XML Schema tree into the current tree
+#
+# Set the targetNamespace of the imported nodes to $import_namespace
+#
+# SYNOPSIS
+#
+# $self->_import_children($name, $imported, $imported, $import_namespace)
+#

 sub _import_children {
    my ($self, $name, $imported, $importer, $import_namespace) = @_;
+
    my $targetNamespace = $importer->get_targetNamespace();
    my $push_method = "push_$name";
    my $get_method = "get_$name";
+    my $default_namespace = $imported->get_xmlns()->{ '#default' };
+
    no strict qw(refs);
    my $value_ref = $imported->$get_method();
    if ($value_ref) {
+
        $value_ref = [ $value_ref ] if (not ref $value_ref eq 'ARRAY');
-        # set xmlns - can be different from parent
+
        for (@{ $value_ref }) {
+            # fixup namespace - new parent may be from different namespace
+            if (defined ($default_namespace)) {
+                my $xmlns = $_->get_xmlns();
+                # it's a hash ref, so we can just update values
+                if (! defined $xmlns->{ '#default'}) {
+                    $xmlns->{ '#default' } = $default_namespace;
+                }
+            }
            # fixup targetNamespace, but don't override
            $_->set_targetNamespace( $import_namespace )
                if ( ($import_namespace ne $targetNamespace) && !  $_->get_targetNamespace);
            # update parent...
            $_->set_parent( $importer );
+
+            # push elements into importing WSDL
+            $importer->$push_method($_);
        }
-        # push elements into importing WSDL
-        $importer->$push_method(@{ $value_ref });
+    }
+}
+
+sub _import_namespace_definitions {
+    my $self = shift;
+    my $arg_ref = shift;
+    my $importer = $arg_ref->{ importer };
+    my $imported = $arg_ref->{ imported };
+
+    # import namespace definitions, too
+    my $importer_ns_of = $importer->get_xmlns();
+    my %xmlns_of = %{ $imported->get_xmlns() };
+
+    # it's a hash ref, we can just add to.
+    # TODO: check whether prefix is already taken.
+    # TODO: check wheter URI is the better key.
+    while (my ($prefix, $url) = each %xmlns_of) {
+        $importer_ns_of->{ $prefix } = $url;
    }
 }

 sub xml_schema_import {
    my $self = shift;
    my $schema = shift;
-    my $parser = ref($self)->new();
+    my $parser = $self->clone();
    my %attr_of = @_;
    my $import_namespace = $attr_of{ namespace };
-    my $uri = URI->new_abs($attr_of{schemaLocation}, $self->get_uri() );
-    my $import = $parser->parse_uri($uri);

-    for my $name ( qw(type element group) ) {
-        $self->_import_children( $name, $import, $schema, $import_namespace);
+    if (not $attr_of{schemaLocation}) {
+        warn "cannot import document for namespace >$import_namespace< without location";
+        return;
+    }
+
+    if (not $self->get_uri) {
+        die "cannot import document from namespace >$import_namespace< without base uri. Use >parse_uri< or >set_uri< to set one."
+    }
+
+    my $uri = URI->new_abs($attr_of{schemaLocation}, $self->get_uri() );
+    my $imported = $parser->parse_uri($uri);
+
+    # might already be imported - parse_uri just returns in this case
+    return if not defined $imported;
+
+    $self->_import_namespace_definitions({
+        importer => $schema,
+        imported => $imported,
+    });
+
+    for my $name ( qw(type element group attribute attributeGroup) ) {
+        $self->_import_children( $name, $imported, $schema, $import_namespace);
    }
 }

 sub wsdl_import {
    my $self = shift;
    my $definitions = shift;
-    my $parser = ref($self)->new();
+    my $parser = $self->clone();
    my %attr_of = @_;
    my $import_namespace = $attr_of{ namespace };
+
+    if (not $attr_of{location}) {
+        warn "cannot import document for namespace >$import_namespace< without location";
+        return;
+    }
+
+    if (not $self->get_uri) {
+        die "cannot import document from namespace >$import_namespace< without base uri. Use >parse_uri< or >set_uri< to set one."
+    }
+
    my $uri = URI->new_abs($attr_of{location}, $self->get_uri() );

-    my $import = $parser->parse_uri($uri);
+    my $imported = $parser->parse_uri($uri);
+
+    # might already be imported - parse_uri just returns in this case
+    return if not defined $imported;
+
+    $self->_import_namespace_definitions({
+        importer => $definitions,
+        imported => $imported,
+    });
+
    for my $name ( qw(types message binding portType service) ) {
-        $self->_import_children( $name, $import, $definitions, $import_namespace);
+        $self->_import_children( $name, $imported, $definitions, $import_namespace);
    }
 }

@@ -72,7 +150,9 @@ sub _initialize {
    # TODO skip non-XML Schema namespace tags
    $parser->setHandlers(
        Start => sub {
-            my ($parser, $localname, %attrs) = @_;
+            # handle attrs as list - expat uses dual-vars for looking
+            # up namespace information, and hash keys don't allow dual vars...
+            my ($parser, $localname, @attrs) = @_;
            $characters = q{};

            my $action = SOAP::WSDL::TypeLookup->lookup(
@@ -86,10 +166,11 @@ sub _initialize {
                eval "require $action->{ class }";
                croak $@ if ($@);

-                my $obj = $action->{ class }->new({ parent => $current,
-                    xmlns => { '#default' => $parser->namespace($localname) }
+                my $obj = $action->{ class }->new({
+                        parent => $current,
+                        namespace => $parser->namespace($localname),
                    })
-                  ->init( _fixup_attrs( $parser, %attrs ) );
+                  ->init( _fixup_attrs( $parser, @attrs ) );

                if ($current) {
                    # inherit namespace, but don't override
@@ -105,14 +186,12 @@ sub _initialize {
                    # remember element for stepping back
                    push @{ $list }, $current;
                }
-                else {
-                    $self->{ data } = $obj;
-                }
+
                # set new element (step down)
                $current = $obj;
            }
            elsif ($action->{ type } eq 'PARENT') {
-                $current->init( _fixup_attrs($parser, %attrs) );
+                $current->init( _fixup_attrs($parser, @attrs) );
            }
            elsif ($action->{ type } eq 'METHOD') {
                my $method = $action->{ method };
@@ -128,12 +207,12 @@ sub _initialize {
                    ? ref $action->{ value }
                        ? @{ $action->{ value } }
                        : ($action->{ value })
-                    : _fixup_attrs($parser, %attrs)
+                    : _fixup_attrs($parser, @attrs)
                );
            }
            elsif ($action->{type} eq 'HANDLER') {
                my $method = $self->can($action->{method});
-                $method->($self, $current, %attrs);
+                $method->($self, $current, @attrs);
            }
            else {
                # TODO replace by hash lookup of known namespaces.
@@ -159,6 +238,11 @@ sub _initialize {
                $localname
            ) || {};

+            if (! defined $list->[-1]) {
+                $self->{ data } = $current;
+                return;
+            }
+
            return if not ($action->{ type });
            if ( $action->{ type } eq 'CLASS' ) {
               $current = pop @{ $list };
@@ -181,29 +265,40 @@ sub _initialize {

 # make attrs SAX style
 sub _fixup_attrs {
-    my ($parser, %attrs_of) = @_;
+    my ($parser, @attrs) = @_;

-    my @attrs_from = map { $_ =
-        {
-            Name => $_,
-            Value => $attrs_of{ $_ },
-            LocalName => $_
-        }
-    } keys %attrs_of;
+    my @attr_key_from = ();
+    my @attr_value_from = ();
+
+    while (@attrs) {
+        push @attr_key_from, shift @attrs;
+        push @attr_value_from, shift @attrs;
+    }
+
+    my @attrs_from;

    # add xmlns: attrs. expat eats them.
+    #
+    # add namespaces before attributes: Attributes may be namespace-qualified
+    #
    push @attrs_from, map {
-        # ignore xmlns=FOO namespaces - must be XML schema
-        # Other nodes should be ignored somewhere else
-        ($_ eq '#default')
-        ? ()
-        :
        {
            Name => "xmlns:$_",
            Value => $parser->expand_ns_prefix( $_ ),
            LocalName => $_
        }
    } $parser->new_ns_prefixes();
+
+    push @attrs_from, map {
+        {
+            Name => defined $parser->namespace($_)
+                ? $parser->namespace($_) . '|' . $_
+                : '|' . $_,
+            Value => shift @attr_value_from, # $attrs_of{ $_ },
+            LocalName => $_
+        }
+    } @attr_key_from;
+
    return @attrs_from;
 }

@@ -241,11 +336,11 @@ the same terms as perl itself

 =head1 Repository information

- $Id: $
+ $Id: WSDLParser.pm 728 2008-07-13 19:28:50Z kutterma $

- $LastChangedDate: 2008-02-11 00:14:27 +0100 (Mo, 11 Feb 2008) $
- $LastChangedRevision: 522 $
+ $LastChangedDate: 2008-07-13 21:28:50 +0200 (So, 13 Jul 2008) $
+ $LastChangedRevision: 728 $
 $LastChangedBy: kutterma $

- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/WSDLParser.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/WSDLParser.pm $

--- a/lib/SOAP/WSDL/Factory/Deserializer.pm
+++ b/lib/SOAP/WSDL/Factory/Deserializer.pm
@@ -2,7 +2,7 @@ package SOAP::WSDL::Factory::Deserializer;
 use strict;
 use warnings;

-our $VERSION = '2.00_24';
+use version; our $VERSION = qv('2.00.05');

 my %DESERIALIZER = (
    '1.1' => 'SOAP::WSDL::Deserializer::XSD',
@@ -47,10 +47,10 @@ SOAP::WSDL::Factory::Deserializer - Factory for retrieving Deserializer objects
 # in deserializer class:
 package MyWickedDeserializer;
 use SOAP::WSDL::Factory::Deserializer;
- 
+
 # register class as deserializer for SOAP1.2 messages
 SOAP::WSDL::Factory::Deserializer->register( '1.2' , __PACKAGE__ );
- 
+
 =head1 DESCRIPTION

 SOAP::WSDL::Factory::Deserializer serves as factory for retrieving
@@ -150,5 +150,5 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 $LastChangedBy: kutterma $
 $Id: Serializer.pm 176 2007-08-31 15:28:29Z kutterma $
 $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Serializer.pm $
- 
+
 =cut
--- a/lib/SOAP/WSDL/Factory/Generator.pm
+++ b/lib/SOAP/WSDL/Factory/Generator.pm
@@ -2,7 +2,7 @@ package SOAP::WSDL::Factory::Generator;
 use strict;
 use warnings;

-our $VERSION='2.00_24';
+use version; our $VERSION = qv('2.00.05');

 my %GENERATOR = (
    'XSD' => 'SOAP::WSDL::Generator::Template::XSD',
@@ -49,10 +49,10 @@ SOAP::WSDL::Factory:Generator - Factory for retrieving generator objects
 # in generator class:
 package MyWickedGenerator;
 use SOAP::WSDL::Factory::Generator;
- 
+
 # register as generator for SOAP1.2 messages
 SOAP::WSDL::Factory::Generator->register( '1.2' , __PACKAGE__ );
- 
+
 =head1 DESCRIPTION

 SOAP::WSDL::Factory::Generator serves as factory for retrieving
@@ -168,5 +168,5 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 $LastChangedBy: kutterma $
 $Id: Serializer.pm 176 2007-08-31 15:28:29Z kutterma $
 $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Serializer.pm $
- 
+
 =cut
--- a/lib/SOAP/WSDL/Factory/Serializer.pm
+++ b/lib/SOAP/WSDL/Factory/Serializer.pm
@@ -2,7 +2,7 @@ package SOAP::WSDL::Factory::Serializer;
 use strict;
 use warnings;

-our $VERSION='2.00_24';
+use version; our $VERSION = qv('2.00.05');

 my %SERIALIZER = (
    '1.1' => 'SOAP::WSDL::Serializer::XSD',
@@ -46,10 +46,10 @@ SOAP::WSDL::Factory::Serializer - Factory for retrieving serializer objects
 # in serializer class:
 package MyWickedSerializer;
 use SOAP::WSDL::Factory::Serializer;
- 
+
 # register as serializer for SOAP1.2 messages
 SOAP::WSDL::Factory::Serializer->register( '1.2' , __PACKAGE__ );
- 
+
 =head1 DESCRIPTION

 SOAP::WSDL::Factory::Serializer serves as factory for retrieving
@@ -138,9 +138,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 510 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: Serializer.pm 510 2008-01-29 08:03:46Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Serializer.pm $
- 
+ $Id: Serializer.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Serializer.pm $
+
 =cut
--- a/lib/SOAP/WSDL/Factory/Transport.pm
+++ b/lib/SOAP/WSDL/Factory/Transport.pm
@@ -1,10 +1,8 @@
 package SOAP::WSDL::Factory::Transport;
 use strict;
 use warnings;
+use version; our $VERSION = qv('2.00.05');

-our $VERSION='2.00_31';
-
-# class data
 my %registered_transport_of = ();

 # Local constants
@@ -12,7 +10,7 @@ my %registered_transport_of = ();
 my %SOAP_LITE_TRANSPORT_OF = (
    ftp => 'SOAP::Transport::FTP',
    http => 'SOAP::Transport::HTTP',
-    https => 'SOAP::Transport::HTTPS',
+    https => 'SOAP::Transport::HTTP',
    mailto => 'SOAP::Transport::MAILTO',
    'local' => 'SOAP::Transport::LOCAL',
    jabber => 'SOAP::Transport::JABBER',
@@ -32,14 +30,17 @@ sub register {
 }

 sub get_transport {
-    my ($class, $scheme, %attrs) = @_;
+    my ($class, $url, %attrs) = @_;

-    $scheme =~s{ \A ([^\:]+) \: .+ }{$1}x;

-    if ($registered_transport_of{ $scheme }) {
+    my $scheme = $url;
+    $scheme =~s{ \:.+$ }{}xm;
+
+
+    if (defined $registered_transport_of{ $scheme }) {
        no strict qw(refs);
-        defined %{ "$registered_transport_of{ $scheme }::" }
-            or eval "require $registered_transport_of{ $scheme }"
+        $registered_transport_of{ $scheme }->can('new') or
+            eval "require $registered_transport_of{ $scheme }"
                or die "Cannot load transport class $registered_transport_of{ $scheme } : $@";

        # try "foo::Client" class first - SOAP::Tranport always requires
@@ -50,28 +51,30 @@ sub get_transport {
        # sparse resource ...
        # ... but we've decided to mimic SOAP::Lite...

-#        my $protocol_class = $SOAP_LITE_TRANSPORT_OF{ $scheme } . '::Client';
-#        my $transport;
-#        eval {
-#            $transport = $protocol_class->new( %attrs );
-#        };
-#        return $transport if not $@;
        return $registered_transport_of{ $scheme }->new( %attrs );
    }

    # try SOAP::Lite's Transport module - just skip if not require'able
    SOAP_Lite: {
-      if (exists $SOAP_LITE_TRANSPORT_OF{ $scheme }) {
-          eval "require $SOAP_LITE_TRANSPORT_OF{ $scheme }"
-            or last SOAP_Lite;
-          my $protocol_class = $SOAP_LITE_TRANSPORT_OF{ $scheme } . '::Client';
-          return $protocol_class->new( %attrs );
-      }
+        if (exists $SOAP_LITE_TRANSPORT_OF{ $scheme }) {
+            no strict qw(refs);
+            # behaves interestingly different under different versions of perl
+            # maybe true even if it's not available
+            my $protocol_class = $SOAP_LITE_TRANSPORT_OF{ $scheme } . '::Client';
+            $protocol_class->can('new')
+                or eval "require $SOAP_LITE_TRANSPORT_OF{ $scheme }"
+                    or last SOAP_Lite;
+
+            # may fail if it's not available
+            my $transport = eval { $protocol_class->new( %attrs ) }
+                or last SOAP_Lite;
+            return $transport;
+        }
    }

    if (exists $SOAP_WSDL_TRANSPORT_OF{ $scheme }) {
        no strict qw(refs);
-        defined %{ "$SOAP_WSDL_TRANSPORT_OF{ $scheme }::" }
+        $SOAP_WSDL_TRANSPORT_OF{ $scheme }->can('new')
            or eval "require $SOAP_WSDL_TRANSPORT_OF{ $scheme }"
                or die "Cannot load transport class $SOAP_WSDL_TRANSPORT_OF{ $scheme } : $@";
        return $SOAP_WSDL_TRANSPORT_OF{ $scheme }->new( %attrs );
@@ -159,7 +162,7 @@ the class should be used for, and $module is the class' module name.
 To auto-register your transport class on loading, execute register() in your
 tranport class (see L<SYNOPSIS|SYNOPSIS> above).

-Multiple protocols ore multiple classes are registered by multiple calls to
+Multiple protocols or multiple classes are registered by multiple calls to
 register().

 =head2 Transport plugin package layout
@@ -240,9 +243,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>

 =head1 REPOSITORY INFORMATION

- $Rev: 524 $
+ $Rev: 728 $
 $LastChangedBy: kutterma $
- $Id: Transport.pm 524 2008-02-10 23:24:43Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Transport.pm $
+ $Id: Transport.pm 728 2008-07-13 19:28:50Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Transport.pm $

 =cut
--- a/lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm
+++ b/lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm
@@ -0,0 +1,271 @@
+package SOAP::WSDL::Generator::Iterator::WSDL11;
+use strict; use warnings;
+use Class::Std::Fast;
+
+use version; our $VERSION = qv('2.00.05');
+
+my %definitions_of  :ATTR(:name<definitions>    :default<[]>);
+my %nodes_of        :ATTR(:name<nodes>          :default<[]>);
+
+# memoization attributes
+my %portType_of     :ATTR();
+my %types_of        :ATTR();
+
+my %METHOD_OF = (
+    'SOAP::WSDL::Definitions'   => 'get_service',
+    'SOAP::WSDL::Service'       => 'get_port',
+    'SOAP::WSDL::Port'          => sub {
+        my ($self, $node) = @_;
+        return if ! $node->first_address()
+            or ! $node->first_address()->isa('SOAP::WSDL::SOAP::Address');
+
+        return [ $self->get_definitions()
+            ->find_binding( $node->expand( $node->get_binding() ) ) || () ];
+    },
+
+    'SOAP::WSDL::Binding'       => sub {
+        my ($self, $node) = @_;
+
+        # remember referenced portType
+        $portType_of{ ident $self } = $self->get_definitions()
+            ->find_portType( $node->expand( $node->get_type ) )
+            or return [];
+
+        return $node->get_operation();
+    },
+
+    'SOAP::WSDL::Operation'     => sub {
+        my ($self, $node) = @_;
+
+        my $name = $node->get_name();
+
+        # get the equally named operation from the portType
+        my ($op) = grep { $_->get_name() eq $name }
+            @{ $portType_of{ ident $self }->get_operation() }
+            or return [];
+
+        return [ @{ $op->get_input }, @{ $op->get_output }, @{ $op->get_fault } ]
+    },
+
+    'SOAP::WSDL::OpMessage' => sub {
+        my ($self, $node) = @_;
+        return if ( ref $node->get_parent() eq 'SOAP::WSDL::Binding' );    # we're in binding
+
+        # TODO maybe allow more messages && overloading by specifying name
+
+        return [ $self->get_definitions()->find_message(
+            $node->expand( $node->get_message() )
+        ) || () ];
+    },
+
+    'SOAP::WSDL::Message'       => 'get_part',
+
+    'SOAP::WSDL::Part'          => sub {
+        my ($self, $node) = @_;
+        my $ident = ident $self;
+        my $types = $types_of{ $ident } = $definitions_of{ $ident }->get_types()->[0]
+            or return [];
+        return [
+            # If we have a type, this type is to be used in document/literal
+            # as global type. However this is forbidden, at least by WS-I.
+            # We should store the style/encoding somewhere, and regard it.
+            # TODO: auto-generate element for RPC bindings
+            $node->get_type()
+                ? do {
+                    die "unsupported global type <"
+                        . $node->get_type . "> found in part ". $node->get_name();
+                    ## use this once we can auto-generate an element for RPC bindings
+                    # $types->find_type( $node->expand($node->get_type) )
+                }
+                : (),
+            $node->get_element()
+                ? $types->find_element( $node->expand($node->get_element) )
+                : (),
+        ];
+    },
+);
+
+sub init {
+    my ($self, $arg_of) = @_;
+    my $ident = ident $self;
+    undef $portType_of{ $ident };
+    undef $types_of{ $ident };
+    $nodes_of{ $ident } = [
+        exists($arg_of->{ node })
+            ? $arg_of->{ node }
+            : $definitions_of{ ident $self }
+        ];
+}
+
+sub get_next {
+    my $self = shift;
+    my $ident = ident $self;
+
+    my $node = shift @{ $nodes_of{ $ident }};
+    return if ! defined $node;
+
+    unshift @{ $nodes_of{ $ident }}, @{ $self->get_nextNodes( $node ) || [] };
+
+    return $node;
+}
+
+sub get_nextNodes {
+    my ($self, $node) = @_;
+
+    my $method = $METHOD_OF{ ref $node }
+        or return [];
+
+    return (ref($method) eq 'CODE')
+        ? $method->( $self, $node )
+        : $node->can($method)->( $node );
+}
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+SOAP::WSDL::Generator::Iterator::WSDL11 - WSDL 1.1 Iterator
+
+=head1 SYNOPSIS
+
+ my $iter = SOAP::WSDL::Generator::Iterator::WSDL11->new({
+     definitions => $wsdl
+ });
+ $iter->init();
+ while (my $node = $iter->get_next()) {
+     # do something with node - possibly call _accept with a visitor on it...
+ }
+
+=head1 DESCRIPTION
+
+Iterator for walking a WSDL 1.1 definition.
+
+The iterator performs a depth-first search along the following path:
+
+ service
+ port
+ binding
+ operation
+ input/output/fault of operation in portType
+ message
+ part
+ type/element in XML schema
+
+If you wonder about this path: This is how to look up which XML Schema element
+is associated with a operation from a service/port.
+
+=head2 Example
+
+The nodes are returned in the order denoted in the following example:
+
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- 1 -->
+ <definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+   xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="urn:HelloWorld"
+   targetNamespace="urn:HelloWorld"
+   xmlns="http://schemas.xmlsoap.org/wsdl/">
+   <types>
+     <s:schema elementFormDefault="qualified" targetNamespace="urn:HelloWorld">
+       <!-- 9 -->
+       <s:element name="sayHello">
+         <s:complexType>
+            <s:sequence>
+              <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
+              <s:element minOccurs="0" maxOccurs="1" name="givenName" type="s:string" nillable="1" />
+            </s:sequence>
+            <s:attribute name="testAttr" type="s:string" use="optional"></s:attribute>
+          </s:complexType>
+        </s:element>
+
+        <!-- 13 -->
+        <s:element name="sayHelloResponse">
+          <s:complexType>
+            <s:sequence>
+              <s:element minOccurs="0" maxOccurs="1"
+                name="sayHelloResult" type="s:string" />
+           </s:sequence>
+         </s:complexType>
+       </s:element>
+     </s:schema>
+   </types>
+
+   <!-- 7 -->
+   <message name="sayHelloSoapIn">
+     <!-- 8 -->
+     <part name="parameters" element="s0:sayHello" />
+   </message>
+
+   <!-- 11 -->
+   <message name="sayHelloSoapOut">
+     <!-- 12 -->
+     <part name="parameters" element="s0:sayHelloResponse" />
+   </message>
+
+   <portType name="Service1Soap">
+     <operation name="sayHello">
+     <!-- 6 -->
+     <input message="s0:sayHelloSoapIn" />
+     <!-- 10 -->
+     <output message="s0:sayHelloSoapOut" />
+   </operation>
+  </portType>
+
+    <!-- 4 -->
+    <binding name="Service1Soap" type="s0:Service1Soap">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+            style="document" />
+
+        <!-- 5 -->
+        <operation name="sayHello">
+            <soap:operation soapAction="urn:HelloWorld#sayHello"
+                style="document" />
+
+            <input>
+                <soap:body use="literal" />
+            </input>
+
+            <output>
+                <soap:body use="literal" />
+            </output>
+        </operation>
+    </binding>
+
+    <!-- 2 -->
+    <service name="Service1">
+        <!-- 3 -->
+        <port name="Service1Soap" binding="s0:Service1Soap">
+            <soap:address
+                location="http://localhost:81/soap-wsdl-test/helloworld.pl" />
+        </port>
+    </service>
+ </definitions>
+
+You should not rely too much on this order - it may change. Even though the
+current order will probably remain, the nodes currently skipped might
+be returned somewhere along the path.
+
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2004-2008 Martin Kutter.
+
+This file is part of SOAP-WSDL. You may distribute/modify it under
+the same terms as perl itself
+
+=head1 AUTHOR
+
+Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
+
+=head1 REPOSITORY INFORMATION
+
+ $Rev: 239 $
+ $LastChangedBy: kutterma $
+ $Id: Client.pm 239 2007-09-11 09:45:42Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $
+
+=cut
--- a/lib/SOAP/WSDL/Generator/PrefixResolver.pm
+++ b/lib/SOAP/WSDL/Generator/PrefixResolver.pm
@@ -0,0 +1,145 @@
+package SOAP::WSDL::Generator::PrefixResolver;
+use strict; use warnings;
+
+use Class::Std::Fast::Storable;
+
+use version; our $VERSION = qv('2.00.05');
+
+my %namespace_prefix_map_of :ATTR(:name<namespace_prefix_map>   :default<{}>);
+my %namespace_map_of        :ATTR(:name<namespace_map>          :default<{}>);
+my %prefix_of               :ATTR(:name<prefix> :default<{}>);
+
+sub resolve_prefix {
+    my ($self, $type, $namespace, $element) = @_;
+    my $prefix;
+    if (not defined($namespace)) {
+        $prefix = $prefix_of{ $$self }->{ $type }
+    }
+    else {
+        $prefix = $namespace_prefix_map_of{ $$self }->{ $namespace }
+            || ( ($namespace_map_of{ $$self }->{ $namespace })
+                ? join ('::', $prefix_of{ $$self }->{ $type }, $namespace_map_of{ $$self }->{ $namespace })
+                : $prefix_of{ $$self }->{ $type }
+            );
+    }
+    return "${prefix}::";
+}
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+SOAP::WSDL::Generator::PrefixResolver - prefixes for different classes
+
+=head1 SYNOPSIS
+
+If you want to create your custom prefix resolver:
+
+ package MyPrefixResolver;
+ use strict; use warnings;
+ use base qw(SOAP::WSDL::Generator::PrefixResolver);
+
+ sub resolve_prefix {
+     my ($self, $type, $namespace, $node) = @_;
+     # return something special
+     return $self->SUPER::resolve_prefix($type, $namespace, $node);
+ }
+
+When generating code:
+
+ use MyPrefixResolver;
+ use SOAP::WSDL::Generator::XSD;
+ my $generator = SOAP::WSDL::Generator::Template::XSD->new({
+    prefix_resolver_class => 'MyPrefixResolver',
+ });
+
+=head1 DESCRIPTION
+
+Prefix resolver class for SOAP::WSDL's code generator. You may subclass it to
+apply some custom prefix resolving logic.
+
+Subclasses must implement the following methods:
+
+=over
+
+=item * resolve_prefix
+
+ sub resolve_prefix {
+    my ($self, $namespace, $node) = @_;
+    # ...
+ }
+
+resolve_prefix is expected to return a (perl class) prefix. It is called with
+the following parameters:
+
+ NAME       DESCRIPTION
+ -----------------------------------------------------------------------------
+ type       One of (server|interface|typemap|type|element|attribute)
+ namespace  The targetNamespace of the node to generate a prefix for.
+ node       The node to generate a prefix for
+
+You usually just need type and namespace for prefix resolving. node is
+provided for rather funky setups, where you have to choose different prefixes
+based on type names or whatever.
+
+Node may be of any of the following classes:
+
+ SOAP::WSDL::Service
+ SOAP::WSDL::XSD::Attribute
+ SOAP::WSDL::XSD::Element
+ SOAP::WSDL::XSD::Type
+
+Note that both namespace and node may be undef - you should test for
+definedness before doing anything fancy with them.
+
+If you want your prefixes to represent perl class hierarchies, they should
+end with '::'.
+
+Example:
+
+Imagine you're generating interfaces for the Acme Pet Shop. Acme Corp. has
+set up their datatypes to be global across all interfaces (and products), while
+elements are local to the product (the Pet Shop in the example).
+All elements are in the urn:Acme namespace.
+
+In addition, there are types in the namespace urn:Acme:Goods, which should go
+into the same namespace as types, but be prefixed with 'Goods_'
+
+You may want prefixes (roughly) like this:
+
+ Interfaces:        Acme::Client::PetShop::
+ Server:            Acme::Server::PetShop::
+ Types:             Acme::Types::
+ Types (Goods):     Acme::Types::Goods_
+ Elements:          Acme::Elements::PetShop::
+ Typemaps:          Acme::Typemaps::PetShop::
+
+=back
+
+=head1 BUGS AND LIMITATIONS
+
+You cannot suffix your types by some rule yet...
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2008 Martin Kutter.
+
+This file is part of SOAP-WSDL. You may distribute/modify it under
+the same terms as perl itself
+
+=head1 AUTHOR
+
+Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
+
+=head1 REPOSITORY INFORMATION
+
+ $Rev: 583 $
+ $LastChangedBy: kutterma $
+ $Id: $
+ $HeadURL: $
+
+=cut
--- a/lib/SOAP/WSDL/Generator/Template.pm
+++ b/lib/SOAP/WSDL/Generator/Template.pm
@@ -1,21 +1,26 @@
 package SOAP::WSDL::Generator::Template;
-use strict;
+use strict; use warnings;
 use Template;
 use Class::Std::Fast::Storable;
+use Carp;
+use SOAP::WSDL::Generator::PrefixResolver;

-our $VERSION=q{2.00_25};
+use version; our $VERSION = qv('2.00.05');

 my %tt_of               :ATTR(:get<tt>);
-my %definitions_of      :ATTR(:name<definitions>    :default<()>);
-my %server_prefix_of    :ATTR(:name<server_prefix> :default<MyServer>);
-my %interface_prefix_of :ATTR(:name<interface_prefix> :default<MyInterfaces>);
-my %typemap_prefix_of   :ATTR(:name<typemap_prefix> :default<MyTypemaps>);
-my %type_prefix_of      :ATTR(:name<type_prefix>    :default<MyTypes>);
-my %element_prefix_of   :ATTR(:name<element_prefix> :default<MyElements>);
-my %INCLUDE_PATH_of     :ATTR(:name<INCLUDE_PATH>   :default<()>);
-my %EVAL_PERL_of        :ATTR(:name<EVAL_PERL>      :default<0>);
-my %RECURSION_of        :ATTR(:name<RECURSION>      :default<0>);
-my %OUTPUT_PATH_of      :ATTR(:name<OUTPUT_PATH>    :default<.>);
+my %definitions_of      :ATTR(:name<definitions>        :default<()>);
+my %server_prefix_of    :ATTR(:name<server_prefix>      :default<MyServer>);
+my %interface_prefix_of :ATTR(:name<interface_prefix>   :default<MyInterfaces>);
+my %typemap_prefix_of   :ATTR(:name<typemap_prefix>     :default<MyTypemaps>);
+my %type_prefix_of      :ATTR(:name<type_prefix>        :default<MyTypes>);
+my %element_prefix_of   :ATTR(:name<element_prefix>     :default<MyElements>);
+my %attribute_prefix_of :ATTR(:name<attribute_prefix>   :default<MyAttributes>);
+my %INCLUDE_PATH_of     :ATTR(:name<INCLUDE_PATH>       :default<()>);
+my %EVAL_PERL_of        :ATTR(:name<EVAL_PERL>          :default<0>);
+my %RECURSION_of        :ATTR(:name<RECURSION>          :default<0>);
+my %OUTPUT_PATH_of      :ATTR(:name<OUTPUT_PATH>        :default<.>);
+
+my %prefix_resolver_class_of    :ATTR(:name<prefix_resolver_class> :default<SOAP::WSDL::Generator::PrefixResolver>);

 sub START {
    my ($self, $ident, $arg_ref) = @_;
@@ -25,29 +30,43 @@ sub _process :PROTECTED {
    my ($self, $template, $arg_ref, $output) = @_;
    my $ident = ident $self;

-    $tt_of{$ident} = Template->new(
+    # always create a new Template object to
+    # force re-loading of plugins.
+    my $tt = Template->new(
        DEBUG => 1,
        EVAL_PERL => $EVAL_PERL_of{ $ident },
        RECURSION => $RECURSION_of{ $ident },
        INCLUDE_PATH => $INCLUDE_PATH_of{ $ident },
        OUTPUT_PATH => $OUTPUT_PATH_of{ $ident },
+        PLUGIN_BASE => 'SOAP::WSDL::Generator::Template::Plugin',
    )
-        if (not $tt_of{ $ident });
+        or die Template->error();

-    $tt_of{ $ident }->process( $template,
+    $tt->process( $template,
    {
+        context => {
+            prefix_resolver => $prefix_resolver_class_of{ $$self }->new({
+                namespace_prefix_map => {
+                    'http://www.w3.org/2001/XMLSchema' => 'SOAP::WSDL::XSD::Typelib::Builtin',
+                },
+                namespace_map => {
+                },
+                prefix => {
+                    interface => $self->get_interface_prefix,
+                    element => $self->get_element_prefix,
+                    attribute => $self->get_attribute_prefix,
+                    server => $self->get_server_prefix,
+                    type => $self->get_type_prefix,
+                    typemap => $self->get_typemap_prefix,
+                }
+            }),
+        },
        definitions => $self->get_definitions,
-        interface_prefix => $self->get_interface_prefix,
-        server_prefix => $self->get_server_prefix,
-        type_prefix => $self->get_type_prefix,
-        typemap_prefix => $self->get_typemap_prefix,
-        TYPE_PREFIX => $self->get_type_prefix,
-        element_prefix => $self->get_element_prefix,
        NO_POD => delete $arg_ref->{ NO_POD } ? 1 : 0 ,
        %{ $arg_ref }
    },
    $output)
-        or die $INCLUDE_PATH_of{ $ident }, '\\', $template, ' ', $tt_of{ $ident }->error();
+        or croak $INCLUDE_PATH_of{ $ident }, '\\', $template, ' ', $tt->error();
 }

-1;
+1;
--- a/lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm
+++ b/lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm
@@ -0,0 +1,212 @@
+package SOAP::WSDL::Generator::Template::Plugin::XSD;
+use strict;
+use warnings;
+use Carp qw(confess);
+use Class::Std::Fast::Storable constructor => 'none';
+use Scalar::Util qw(blessed);
+use version; our $VERSION = qv('2.00.05');
+
+my %namespace_prefix_map_of :ATTR(:name<namespace_prefix_map>   :default<{}>);
+my %namespace_map_of        :ATTR(:name<namespace_map>          :default<{}>);
+my %prefix_of               :ATTR(:name<prefix>                 :default<()>);
+my %prefix_resolver_of      :ATTR(:name<prefix_resolver>        :default<()>);
+my %definitions_of          :ATTR(:name<definitions>            :default<()>);
+
+
+# create a singleton
+sub load {              # called as MyPlugin->load($context)
+    my ($class, $context, @arg_from) = @_;
+    my $stash = $context->stash();
+    my $self = bless \do { my $o = Class::Std::Fast::ID() }, $class;
+    $self->set_prefix_resolver( $stash->{ context }->{ prefix_resolver });
+    $self->set_definitions( $stash->{ definitions });
+    return $self;       # returns 'MyPlugin'
+}
+
+sub new {
+    return shift if ref $_[0];
+
+    my ($class, $arg_ref) = @_;
+
+    my $self = bless \do { my $o = Class::Std::Fast::ID() }, $class;
+    $self->set_prefix_resolver( $arg_ref->{ prefix_resolver });
+    $self->set_definitions( $arg_ref->{ definitions });
+    return $self;       # returns 'MyPlugin'
+}
+
+sub _get_prefix {
+    my ($self, $type, $node) = @_;
+    my $namespace = defined ($node)
+        ? ref($node)
+            ? $node->get_targetNamespace()
+            : $node
+        : undef;
+    return $self->get_prefix_resolver()->resolve_prefix(
+        $type,
+        $namespace,
+        ref($node)
+            ? $node
+            : undef
+     );
+}
+
+sub create_xsd_name {
+    my ($self, $node) = @_;
+    confess "no node $node" if not defined($node)
+        or $node eq "";
+    my $name = $self->_resolve_prefix($node) #. '::'
+        . $node->get_name();
+    return $self->perl_name( $name );
+}
+
+sub create_typemap_name {
+    my ($self, $node) = @_;
+    my $name = $self->_get_prefix('typemap') #. '::'
+        . $node->get_name();
+    return $self->perl_name( $name );
+}
+
+sub create_server_name {
+    my ($self, $server, $port) = @_;
+    my $port_name = $port->get_name();
+    $port_name =~s{\A (?:.+)\. ([^\.]+) \z}{$1}x;
+    my $name = join( q{},
+        $self->_get_prefix('server', $server),
+         join( '::', $server->get_name(), $port_name)
+    );
+    return $self->perl_name( $name );
+}
+
+sub create_interface_name {
+    my ($self, $server, $port) = @_;
+    my $port_name = $port->get_name();
+    $port_name =~s{\A (?:.+)\. ([^\.]+) \z}{$1}x;
+    my $name = join( q{},
+        $self->_get_prefix('interface', $server),
+        join( '::', $server->get_name(), $port_name )
+    );
+    return $self->perl_name( $name );
+}
+
+sub _resolve_prefix {
+    my ($self, $node) = @_;
+
+    if ($node->isa('SOAP::WSDL::XSD::Builtin')) {
+        return $self->_get_prefix('type', $node)
+    }
+    if ( $node->isa('SOAP::WSDL::XSD::SimpleType')
+        or $node->isa('SOAP::WSDL::XSD::ComplexType')
+    ) {
+        return $self->_get_prefix('type', $node);
+    }
+    if ( $node->isa('SOAP::WSDL::XSD::Element') ) {
+        return $self->_get_prefix('element', $node);
+    }
+    if ( $node->isa('SOAP::WSDL::XSD::Attribute') ) {
+        return $self->_get_prefix('attribute', $node);
+    }
+}
+
+sub perl_name {
+    my $self = shift;
+    my $name = shift;
+    $name =~s{\-}{_}xmsg;
+    $name =~s{\.}{::}xmsg;
+    return $name;
+}
+
+sub perl_var_name {
+    my $self = shift;
+    my $name = shift;
+    $name =~s{\-}{_}xmsg;
+    $name =~s{\.}{__}xmsg;
+    return $name;
+}
+
+sub create_subpackage_name {
+    my $self        = shift;
+    my $arg_ref     = shift;
+    my $type        = ref $arg_ref eq 'HASH' ? $arg_ref->{ value } : $arg_ref;
+
+    my @name_from = $type->get_name() || (); ;
+    my $parent = $type;
+    my $top_node = $parent;
+    if (! $parent->get_parent()->isa('SOAP::WSDL::XSD::Schema') ) {
+        NAMES: while ($parent = $parent->get_parent()) {
+            $top_node = $parent;
+            last NAMES if $parent->get_parent()->isa('SOAP::WSDL::XSD::Schema');
+            # skip empty names - atomic types have no name...
+            unshift @name_from, $parent->get_name()
+                if $parent->get_name();
+        }
+    }
+    # create name for top node
+    die "FOO" if not defined $top_node;
+    my $top_node_name = $self->create_xsd_name($top_node);
+    my $package_name = join('::_', $top_node_name , (@name_from) ? join('::', @name_from) : () );
+    return $package_name;
+}
+
+sub create_xmlattr_name {
+    return join '::', shift->create_subpackage_name(shift), 'XmlAttr';
+}
+
+sub element_name {
+    my $self = shift;
+    my $element = shift;
+
+    confess "no element object" unless blessed $element;
+
+    my $name = $element->get_name();
+    if (! $name) {
+        while (my $ref = $element->get_ref()) {
+            $element = $self->get_definitions()->first_types()
+                ->find_element($element->expand( $ref ) );
+            $name = $element->get_name();
+            last if ($name);
+        }
+    }
+    return $name;
+}
+
+1;
+
+=pod
+
+=head1 NAME
+
+SOAP::WSDL::Generator::Template::Plugin::XSD - Template plugin for the XSD generator
+
+=head1 METHODS
+
+=head2 perl_name
+
+ XSD.perl_name(element.get_name);
+
+Converts a XML name into a valid perl name (valid for subroutines, variables
+or the like).
+
+perl_name takes a crude approach by just replacing . and - (dot and dash)
+with a underscore. This may or may not be sufficient, and may or may not
+provoke collisions in your XML names.
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2008 Martin Kutter.
+
+This file is part of SOAP-WSDL. You may distribute/modify it under the same
+terms as perl itself
+
+=head1 AUTHOR
+
+Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
+
+=head1 REPOSITORY INFORMATION
+
+ $Rev: 564 $
+ $LastChangedBy: kutterma $
+ $Id: ComplexType.pm 564 2008-02-23 13:31:39Z kutterma $
+ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm $
+
+=cut
+
--- a/lib/SOAP/WSDL/Generator/Template/XSD.pm
+++ b/lib/SOAP/WSDL/Generator/Template/XSD.pm
@@ -1,18 +1,19 @@
 package SOAP::WSDL::Generator::Template::XSD;
-use strict;
+use strict; use warnings;
 use Template;
 use Class::Std::Fast::Storable;
 use File::Basename;
 use File::Spec;

-our $VERSION = q{2.00_27};
+use version; our $VERSION = qv('2.00.05');

 use SOAP::WSDL::Generator::Visitor::Typemap;
 use SOAP::WSDL::Generator::Visitor::Typelib;
+use SOAP::WSDL::Generator::Template::Plugin::XSD;
 use base qw(SOAP::WSDL::Generator::Template);

-my %output_of  :ATTR(:name<output> :default<()>);
-my %typemap_of :ATTR(:name<typemap> :default<({})>);
+my %output_of                   :ATTR(:name<output>         :default<()>);
+my %typemap_of                  :ATTR(:name<typemap>        :default<({})>);

 sub BUILD {
    my ($self, $ident, $arg_ref) = @_;
@@ -46,93 +47,104 @@ sub BUILD {
    );
 }

+# construct object on call to allow late binding of prefix_resolver class
+# and namespace maps (not used yet)
+sub get_name_resolver {
+    my $self = shift;
+    return SOAP::WSDL::Generator::Template::Plugin::XSD->new({
+        prefix_resolver => $self->get_prefix_resolver_class()->new({
+            namespace_prefix_map => {
+                'http://www.w3.org/2001/XMLSchema' => 'SOAP::WSDL::XSD::Typelib::Builtin',
+            },
+            namespace_map => {
+            },
+            prefix => {
+                attribute   =>  $self->get_attribute_prefix,
+                interface   =>  $self->get_interface_prefix,
+                element     =>  $self->get_element_prefix,
+                server      =>  $self->get_server_prefix,
+                type        =>  $self->get_type_prefix,
+                typemap     =>  $self->get_typemap_prefix,
+            }
+        })
+    });
+}
+
 sub generate {
    my $self = shift;
    my $opt = shift;
    $self->generate_typelib( $opt );
-#    $self->generate_interface( $opt );
    $self->generate_typemap( $opt );
 }

 sub generate_typelib {
    my ($self, $arg_ref) = @_;
-    # $output_of{ ident $self } = "";
    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] ) {
+    for my $type (map {
+            @{ $_->get_type() } ,
+            @{ $_->get_element() },
+            @{ $_->get_attribute() }
+        } @schema[1..$#schema] ) {
        $type->_accept( $self );
    }
-    # return $output_of{ ident $self };
    return;
 }

+sub _generate_interface {
+    my $self = shift;
+    my $arg_ref = shift;
+    my $template_name = delete $arg_ref->{ template_name };
+    my $name_method = delete $arg_ref->{ name_method };
+    for my $service (@{ $self->get_definitions->get_service }) {
+        for my $port (@{ $service->get_port() }) {
+            # Skip ports without (known) address
+            next if not $port->first_address;
+            next if not $port->first_address->isa('SOAP::WSDL::SOAP::Address');
+
+            my $port_name = $port->get_name;
+            $port_name =~s{ \A .+\. }{}xms;
+            my $output = $arg_ref->{ output }
+                ? $arg_ref->{ output }
+                : $self->_generate_filename(
+                    $self->get_name_resolver()->can($name_method)->(
+                        $self->get_name_resolver(),
+                        $service,
+                        $port,
+                ));
+            print "Creating interface class $output\n";
+
+            $self->_process($template_name,
+            {
+                service => $service,
+                port => $port,
+                NO_POD => $arg_ref->{ NO_POD } ? 1 : 0 ,
+             },
+            $output, binmode => ':utf8');
+        }
+    }
+}
+
 sub generate_server {
-    my $self = shift;
-    my $ident = ident $self;
-    my $arg_ref = shift;
-    for my $service (@{ $self->get_definitions->get_service }) {
-        for my $port (@{ $service->get_port() }) {
-            # Skip ports without (known) address
-            next if not $port->first_address;
-            next if not $port->first_address->isa('SOAP::WSDL::SOAP::Address');
-
-            my $port_name = $port->get_name;
-            $port_name =~s{ \A .+\. }{}xms;
-            my $output = $arg_ref->{ output }
-                ? $arg_ref->{ output }
-                : $self->_generate_filename(
-                    $self->get_server_prefix(),
-                    $service->get_name(),
-                    $port_name,
-            );
-            print "Creating interface class $output\n";
-
-            $self->_process('Server.tt',
-            {
-                service => $service,
-                port => $port,
-                NO_POD => $arg_ref->{ NO_POD } ? 1 : 0 ,
-             },
-            $output, binmode => ':utf8');
-        }
-    }
+    my ($self, $arg_ref) = @_;
+    $arg_ref->{ template_name } = 'Server.tt';
+    $arg_ref->{ name_method } = 'create_server_name';
+    $self->_generate_interface($arg_ref);
 }

-sub generate_interface {
-    my $self = shift;
-    my $ident = ident $self;
-    my $arg_ref = shift;
-    for my $service (@{ $self->get_definitions->get_service }) {
-        for my $port (@{ $service->get_port() }) {
-            # Skip ports without (known) address
-            next if not $port->first_address;
-            next if not $port->first_address->isa('SOAP::WSDL::SOAP::Address');
-
-            my $port_name = $port->get_name;
-            $port_name =~s{ \A .+\. }{}xms;
-            my $output = $arg_ref->{ output }
-                ? $arg_ref->{ output }
-                : $self->_generate_filename(
-                    $self->get_interface_prefix(),
-                    $service->get_name(),
-                    $port_name,
-            );
-            print "Creating interface class $output\n";
-
-            $self->_process('Interface.tt',
-            {
-                service => $service,
-                port => $port,
-                NO_POD => $arg_ref->{ NO_POD } ? 1 : 0 ,
-             },
-            $output, binmode => ':utf8');
-        }
-    }
+sub generate_client {
+    my ($self, $arg_ref) = @_;
+    $arg_ref->{ template_name } = 'Interface.tt';
+    $arg_ref->{ name_method } = 'create_interface_name';
+    $self->_generate_interface($arg_ref);
 }
+sub generate_interface;
+*generate_interface = \&generate_client;

 sub generate_typemap {
    my ($self, $arg_ref) = @_;
+
    my $visitor = SOAP::WSDL::Generator::Visitor::Typemap->new({
        type_prefix => $self->get_type_prefix(),
        element_prefix => $self->get_element_prefix(),
@@ -144,13 +156,23 @@ sub generate_typemap {
            'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
            'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
            %{ $typemap_of{ident $self }},
-        }
+        },
+        resolver => $self->get_name_resolver(),
    });
+
+    use SOAP::WSDL::Generator::Iterator::WSDL11;
+    my $iterator  = SOAP::WSDL::Generator::Iterator::WSDL11->new({
+        definitions => $self->get_definitions });
+
    for my $service (@{ $self->get_definitions->get_service }) {
-            $visitor->visit_Service( $service );
+            $iterator->init({ node => $service });
+            while (my $node = $iterator->get_next()) {
+                $node->_accept( $visitor );
+            }
+
            my $output = $arg_ref->{ output }
                ? $arg_ref->{ output }
-                : $self->_generate_filename( $self->get_typemap_prefix(), $service->get_name() );
+                : $self->_generate_filename( $self->get_name_resolver()->create_typemap_name($service) );
            print "Creating typemap class $output\n";
            $self->_process('Typemap.tt',
            {
@@ -163,19 +185,27 @@ sub generate_typemap {
 }

 sub _generate_filename :PRIVATE {
-    my ($self, @parts) = @_;
-    my $name = join '::', @parts;
+    my ($self, $name) = @_;
    $name =~s{ \. }{::}xmsg;
    $name =~s{ \- }{_}xmsg;
    $name =~s{ :: }{/}xmsg;
    return "$name.pm";
 }

+sub visit_XSD_Attribute {
+    my ($self, $attribute) = @_;
+    my $output = defined $output_of{ ident $self }
+        ? $output_of{ ident $self }
+        : $self->_generate_filename( $self->get_name_resolver()->create_xsd_name($attribute) );
+    $self->_process('attribute.tt', { attribute => $attribute } , $output);
+}
+
 sub visit_XSD_Element {
    my ($self, $element) = @_;
    my $output = defined $output_of{ ident $self }
        ? $output_of{ ident $self }
-        : $self->_generate_filename( $self->get_element_prefix(), $element->get_name() );
+        : $self->_generate_filename( $self->get_name_resolver()->create_xsd_name($element) );
+    warn "Creating element class $output \n";
    $self->_process('element.tt', { element => $element } , $output);
 }

@@ -183,7 +213,8 @@ sub visit_XSD_SimpleType {
    my ($self, $type) = @_;
    my $output = defined $output_of{ ident $self }
        ? $output_of{ ident $self }
-        : $self->_generate_filename( $self->get_type_prefix(), $type->get_name() );
+        : $self->_generate_filename( $self->get_name_resolver()->create_xsd_name($type) );
+    warn "Creating simpleType class $output \n";
    $self->_process('simpleType.tt', { simpleType => $type } , $output);
 }

@@ -191,8 +222,9 @@ sub visit_XSD_ComplexType {
    my ($self, $type) = @_;
    my $output = defined $output_of{ ident $self }
        ? $output_of{ ident $self }
-        : $self->_generate_filename( $self->get_type_prefix(), $type->get_name() );
+        : $self->_generate_filename( $self->get_name_resolver()->create_xsd_name($type) );
+    warn "Creating complexType class $output \n";
    $self->_process('complexType.tt', { complexType => $type } , $output);
 }

-1;
+1;
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt
@@ -1,7 +1,5 @@
-[% interface_name = interface_prefix _ '::'
-    _ service.get_name.replace('\.', '::') _ '::'
-    _ port.get_name.replace('^.+\.','');
-interface_name = interface_name.replace('-','_'); -%]
+[% USE XSD -%]
+[% interface_name = XSD.create_interface_name(service, port) -%]
 package [% interface_name %];
 use strict;
 use warnings;
@@ -10,20 +8,22 @@ use Scalar::Util qw(blessed);
 use base qw(SOAP::WSDL::Client::Base);

 # only load if it hasn't been loaded before
-require [% typemap_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]
-    if not [% typemap_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]->can('get_class');
+require [% XSD.create_typemap_name(service) %]
+    if not [% XSD.create_typemap_name(service) %]->can('get_class');

 sub START {
    $_[0]->set_proxy('[% port.first_address.get_location %]') if not $_[2]->{proxy};
-    $_[0]->set_class_resolver('[% typemap_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]')
+    $_[0]->set_class_resolver('[% XSD.create_typemap_name(service) %]')
        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
 }

 [%      binding = definitions.find_binding( port.expand( port.get_binding ) );
        FOREACH operation = binding.get_operation;
 %][% INCLUDE Interface/Operation.tt %]
-[%

+[%
        END;
 %]

@@ -48,12 +48,12 @@ __END__

 use [% interface_name %];
 my $interface = [% interface_name %]->new();
- 
+
 my $response;
 [%      FOREACH operation = binding.get_operation;
 %] $response = $interface->[% operation.get_name %]();
 [%      END %]
- 
+

 [% head1 %] DESCRIPTION

@@ -82,7 +82,6 @@ All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.

 [% INCLUDE Interface/POD/method_info.tt %]

-
 [%      FOREACH operation = binding.get_operation;
 %][% INCLUDE Interface/POD/Operation.tt %]
 [%      END %]
@@ -91,4 +90,4 @@ All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.

 Generated by SOAP::WSDL on [% PERL %]print scalar localtime() [% END %]

-=cut
+=cut
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface/Body.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface/Body.tt
@@ -1,14 +1,12 @@
 [%  RETURN IF NOT item;
    type = definitions.find_portType( binding.expand( binding.get_type ) );
-    port_op = type.find_operation( definitions.get_targetNamespace, operation.get_name );
+    port_op = type.find_operation( type.get_targetNamespace, operation.get_name );
    message = definitions.find_message( port_op.first_input.expand( port_op.first_input.get_message ) );
    part_from = message.get_part;
    PERL %]
    my $item = $stash->{ item };
    my $def = $stash->{ definitions };
-    my $part_from = $stash->{ part_from };
-    my $type_prefix = $stash->{ type_prefix };
-    my $element_prefix = $stash->{ element_prefix };
+    my $part_from = $stash->{ message }->get_part();

    my @body_part_from = split m{\s}, $item->get_parts;

@@ -17,22 +15,25 @@
        @parts = map {
            my $part = $_;
            (grep {
-                my ($ns, $lname) = $def->expand( $_ );
-                ($lname eq $part->get_name)
+                # my ($ns, $lname) = $def->expand( $_ );
+                ($_ eq $part->get_name)
                } @body_part_from
            )
            ? do {
                my $name;
                ($name = $part->get_element)
                    ? do {
-                        $name =~s{ ^[^:]+: }{}xms;
-                        $element_prefix . '::' . $name;
-                        }
+                        my $element = $def->first_types->find_element($part->expand($name));
+                        my $resolver = $context->plugin('XSD');
+                        $resolver->create_xsd_name($element);
+
+                    }
                    : ($name = $part->get_type)
                        ? do {
-                            $name =~s{ ^[^:]+: }{}xms;
-                            $type_prefix . '::' . $name;
-                            }
+                            my $element = $def->first_types->find_type($part->expand($name));
+                            my $resolver = $context->plugin('XSD');
+                            $resolver->create_xsd_name($element);
+                        }
                    : die "input must have either type or element"
                }
            : ()
@@ -44,13 +45,15 @@
            my $name;
            ($name = $part->get_element)
               ? do {
-                    $name =~s{ ^[^:]+: }{}xms;
-                    "$element_prefix\::$name"
-                    }
+                    my $element = $def->first_types->find_element($part->expand($name));
+                    my $resolver = $context->plugin('XSD');
+                    $resolver->create_xsd_name($element);
+               }
               : ($name = $part->get_type)
                    ? do {
-                        $name =~s{ ^[^:]+: }{}xms;
-                        "$type_prefix\::$name"
+                            my $element = $def->first_types->find_type($part->expand($name));
+                            my $resolver = $context->plugin('XSD');
+                            $resolver->create_xsd_name($element);
                    }
                    : die "input must have either type or element";
        } @{ $part_from };
@@ -63,7 +66,10 @@
    $stash->{ parts } = \@parts;

 [% END %]
-           'use' => '[% item.get_use %]',
-            namespace => '[% item.get_namespace %]',
-            encodingStyle => '[% item.get_encodingStyle %]',
-            parts => [qw( [% parts.join(' ') %] )],
+[% IF item.get_use != 'literal';
+    THROW NOT_SUPPORTED "Body: SOAP::WSDL supports literal encoding only - ${ item.get_use } found";
+END %]
+           'use'            => '[% item.get_use %]',
+            namespace       => '[% item.get_namespace %]',
+            encodingStyle   => '[% item.get_encodingStyle %]',
+            parts           =>  [qw( [% parts.join(' ') %] )],
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface/Header.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface/Header.tt
@@ -11,27 +11,34 @@
    my $def = $stash->{ definitions };
    my $type_prefix = $stash->{ type_prefix };
    my $element_prefix = $stash->{ element_prefix };
-    my ($ns, $lname) = $def->expand( $item->get_part() );
+    #my ($ns, $lname) = $def->expand( $item->get_part() );
+    my $part_name = $item->get_part();
    my ($part) = grep {
-        $_->get_name eq $lname
-        && $_->get_targetNamespace eq $ns } @{ $message->get_part( ) };
+        $_->get_name eq $part_name
+        } @{ $message->get_part( ) };
    my $part_class = do {
        my $name;
        ($name = $part->get_element)
            ? do {
-                $name =~s{ ^[^:]+: }{}xms;
-                $element_prefix . '::' . $name;
+                    my $element = $def->first_types->find_element($part->expand($name));
+                    my $resolver = $context->plugin('XSD');
+                    $resolver->create_xsd_name($element);
                }
            : ($name = $part->get_type)
                ? do {
-                    $name =~s{ ^[^:]+: }{}xms;
-                    $type_prefix . '::' . $name;
-                    }
+                        my $element = $def->first_types->find_type($part->expand($name));
+                        my $resolver = $context->plugin('XSD');
+                        $resolver->create_xsd_name($element);
+                }
                : die "input must have either type or element"
            };
    $stash->{ part_class } = $part_class;
    [% END;
- %]
+%]
+[% IF item.get_use != 'literal';
+    THROW NOT_SUPPORTED "Header: SOAP::WSDL supports literal encoding only - ${ item.get_use } found";
+END %]
+
           'use' => '[% item.get_use %]',
            namespace => '[% item.get_namespace %]',
            encodingStyle => '[% item.get_encodingStyle %]',
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface/Operation.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface/Operation.tt
@@ -4,7 +4,12 @@ sub [% operation.get_name %] {
    return $self->SUPER::call({
        operation => '[% operation.get_name %]',
        soap_action => '[% operation.first_operation.get_soapAction %]',
-        style => '[% operation.get_style || binding.get_style %]',
+        style => [% style = operation.first_operation.get_style || binding.get_style;
+    IF style != "document";
+        THROW NOT_SUPPORTED "SOAP::WSDL supports document encoding only - $style found";
+    END;
+-%]
+'[% style %]',
        body => {
            [% INCLUDE Interface/Body.tt( item = operation.first_input.first_body ); %]
        },
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Operation.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Operation.tt
@@ -4,7 +4,16 @@

 [%     type = definitions.find_portType( binding.expand( binding.get_type ) );
    port_op = type.find_operation( definitions.get_targetNamespace, operation.get_name );
-port_op.get_documentation %]
+    port_op.get_documentation();

- $interface->[% operation.get_name %]([% INCLUDE Interface/POD/Message.tt %] );
- 
+    # for now we only document the first response part - document/literal
+    # doesn't allow more.
+    response_name = port_op.first_output.get_message();
+    response_part = definitions.find_message( port_op.first_output.expand( response_name ) ).get_part();
+    response_body_element = definitions.first_types.find_element( response_part.0.expand( response_part.0.get_element ) );
+    response_body_class = XSD.create_xsd_name(response_body_element);
+%]
+
+Returns a L<[% response_body_class %]|[% response_body_class %]> object.
+
+ $response = $interface->[% operation.get_name %]([% INCLUDE Interface/POD/Message.tt %] );
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/method_info.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface/POD/method_info.tt
@@ -5,3 +5,12 @@ of the corresponding class can be passed instead of the marked hash ref.

 You may pass any combination of objects, hash and list refs to these
 methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
--- a/lib/SOAP/WSDL/Generator/Template/XSD/POD/annotation.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/POD/annotation.tt
@@ -0,0 +1,2 @@
+[% node.get_annotation.0.get_documentation %]
+
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Server.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server.tt
@@ -1,7 +1,6 @@
-[% server_name = server_prefix _ '::'
-    _ service.get_name.replace('\.', '::') _ '::'
-    _ port.get_name.replace('^.+\.','');
-server_name = server_name.replace('-','_'); -%]
+[% USE XSD;
+server_name = XSD.create_server_name(service, port);
+-%]
 package [% server_name %];
 use strict;
 use warnings;
@@ -10,8 +9,8 @@ use Scalar::Util qw(blessed);
 use base qw(SOAP::WSDL::Client::Base);

 # only load if it hasn't been loaded before
-require [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]
-    if not [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]->can('get_class');
+require [% XSD.create_typemap_name(service) %]
+    if not [% XSD.create_typemap_name(service) %]->can('get_class');

 my %transport_class_of :ATTR(:name<transport_class> :default<SOAP::WSDL::Server::CGI>);
 my %transport_of :ATTR(:name<transport> :default<()>);
@@ -31,13 +30,13 @@ sub START {
        or die "Cannot load transport class $transport_class_of{ $ident }: $@";
    $transport_of{ $ident } = $transport_class_of{ $ident }->new({
        action_map_ref => $action_map_ref,
-        class_resolver => '[% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]',
+        class_resolver => '[% XSD.create_typemap_name(service) %]',
        dispatch_to => $dispatch_to{ $ident },
    });
 }

 sub handle {
-    $transport_of{ ${ $_[0] } }->handle();
+    $transport_of{ ${ $_[0] } }->handle(@_[1..$#_]);
 }

 1;
@@ -103,4 +102,4 @@ implementing the SOAP Service methods listed below.

 Generated by SOAP::WSDL on [% PERL %]print scalar localtime() [% END %]

-=pod
+=cut
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt
@@ -3,15 +3,48 @@

 [% head3 %] [% operation.get_name %]

-[%     type = definitions.find_portType( binding.expand( binding.get_type ) );
-    port_op = type.find_operation( definitions.get_targetNamespace, operation.get_name );
-port_op.get_documentation %]
+[%  type            = definitions.find_portType( binding.expand( binding.get_type ) );
+    port_op         = '';
+    FOREACH port_op = type.get_operation();
+        IF (port_op.get_name == operation.get_name);
+            LAST;
+        END;
+    END;
+
+    input_message_name  = port_op.first_input.get_message();
+    output_message_name = port_op.first_output.get_message();
+
+    input_message       = definitions.find_message(port_op.first_input.expand(input_message_name));
+    output_message      = definitions.find_message(port_op.first_output.expand(output_message_name));
+
+    input_parts         = input_message.get_part();
+    output_parts        = output_message.get_part();
+
+# port_op.get_documentation
+%]

 sub [% operation.get_name %] {
    my ($self, $body, $header) = @_;
-    # body is a ??? object - sorry, POD not implemented yet
-    # header is a ??? object - sorry, POD not implemented yet
-
+[%
+    IF (input_parts.size() > 1); -%]
+    # body is a list ref of the following objects:
+    # [
+    #     sorry - POD support not implemented yet
+    # ]
+    [% ELSE;
+        input_element = definitions.first_types.find_element(input_parts.0.expand(input_parts.0.get_element));
+        IF (input_element);
+            class = XSD.create_xsd_name( input_element );
+        ELSE;
+            input_type  = definitions.first_types.find_type(input_parts.0.expand(input_parts.0.get_type));
+            class       = XSD.create_xsd_name( input_type );
+        END;
+    -%]
+    # body is a [% class %] object
+    [%-
+    END;
+    %]
+    # header is a ??? object - sorry, POD support not implemented yet
    # do something with body and header...

    return [% INCLUDE Server/POD/Message.tt %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt
@@ -3,7 +3,7 @@
    #element;
    #STOP;
 -%]
- [% element_prefix %]::[% element.get_name.replace('\.', '::') %]->new([%
+ [% XSD.create_xsd_name(element) %]->new([%
    type = element.first_complexType || element.first_simpleType || definitions.first_types.find_type(
        element.expand( element.get_type ) );
    INCLUDE Interface/POD/Type.tt; %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt
@@ -1,4 +1,5 @@
-package [% typemap_prefix %]::[% service.get_name.replace('\.','::') %];
+[% USE XSD %]
+package [% XSD.create_typemap_name(service) %];
 use strict;
 use warnings;

@@ -27,7 +28,7 @@ __END__

 [% head1 %] NAME

-[% typemap_prefix %]::[% service.get_name.replace('\.','::').replace('-', '_') %]; - typemap for ::[% service.get_name %];
+[% XSD.create_typemap_name(service) %] - typemap for [% service.get_name %]

 [% head1 %] DESCRIPTION

--- a/lib/SOAP/WSDL/Generator/Template/XSD/_type_class.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/_type_class.tt
@@ -1,6 +0,0 @@
-[% type_name = node.expand( type );
-    IF (type_name.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
-SOAP::WSDL::XSD::Typelib::Builtin::[% type_name.1 %]
-[% ELSE -%]
-[% type_prefix %]::[% type_name.1 %]
-[% END -%]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/attribute.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/attribute.tt
@@ -0,0 +1,83 @@
+[% USE XSD(context) %]
+package [% XSD.create_xsd_name(attribute) %];
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { '[% attribute.get_targetNamespace %]' }
+
+__PACKAGE__->__set_name('[% attribute.get_name %]');
+__PACKAGE__->__set_ref([% IF attribute.get_ref; %]'[% attribute.get_ref %]'[% END %]);
+
+[%- IF (type_name = attribute.get_type); -%]
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    [% type = definitions.get_types.0.find_type(attribute.expand(type_name));
+    IF ! type;
+        THROW NOT_FOUND "type " _ type_name _ " not found in attribute " _ attribute.get_name;
+    END;
+    XSD.create_xsd_name(type) %]
+);
+
+}
+[%- ELSIF (ref = attribute.get_ref);
+    ref_from = ref.split(':');
+-%]
+# attribute ref="[% ref %]"
+use base qw(
+    [% ref_element = definitions.get_types.0.find_attribute(attribute.expand(ref));
+    XSD.create_xsd_name( ref_element ); %]
+);
+
+}
+[%- ELSIF (simpleType = attribute.first_simpleType) %]
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+[% INCLUDE simpleType/contentModel.tt -%]
+
+}
+
+[% END %]
+
+1;
+
+[%# work around for CPAN's indexer, which gets disturbed by pod in templates -%]
+[% pod = BLOCK %]=pod[% END -%]
+[% head1 = BLOCK %]=head1[% END -%]
+[% head2 = BLOCK %]=head2[% END -%]
+[% head3 = BLOCK %]=head3[% END -%]
+
+[% pod %]
+
+[% head1 %] NAME
+
+[% XSD.create_xsd_name(attribute) %]
+
+[% head1 %] DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+[% attribute.get_name %] from the namespace [% attribute.get_targetNamespace %].
+
+[% INCLUDE POD/annotation.tt(node = attribute) %]
+
+[% INCLUDE element/POD/contentModel.tt(element = attribute) %]
+
+[% head1 %] METHODS
+
+[% head2 %] new
+
+ my $element = [% XSD.create_xsd_name(attribute) %]->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+[% head1 %] AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType.tt
@@ -1,14 +1,15 @@
-package [% type_prefix %]::[% complexType.get_name.replace('\.','::').replace('-','_') %];
+[% USE XSD -%]
+package [% XSD.create_xsd_name(complexType) %];
 use strict;
 use warnings;
-[% INCLUDE complexType/contentModel.tt %]
+
 [%#
-# Don't include any perl source here - there may be sub-packages...
+# Don't include any perl source for this package below this line  - there
+# may be sub-packages...
 #-%]

-package [% type_prefix %]::[% complexType.get_name.replace('\.','::').replace('-','_') %]::_ATTR;
-use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
-[% INCLUDE complexType/attributeSet.tt %]
+[% INCLUDE complexType/contentModel.tt %]
+
 1;

 [%# work around for CPAN's indexer, which gets disturbed by pod in templates -%]
@@ -21,21 +22,42 @@ use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);

 [% head1 %] NAME

-[% type_prefix %]::[% complexType.get_name.replace('\.','::').replace('-','_') %]
+[% XSD.create_xsd_name(complexType) %]

 [% head1 %] DESCRIPTION

-Perl data type class for the XML Schema defined complextype
+Perl data type class for the XML Schema defined complexType
 [% complexType.get_name %] from the namespace [% complexType.get_targetNamespace %].

+[% INCLUDE POD/annotation.tt(node = complexType) %]
+
+[% IF (complexType.get_element); %]
 [% head2 %] PROPERTIES

 The following properties may be accessed using get_PROPERTY / set_PROPERTY
 methods:

+=over
+
 [% FOREACH element = complexType.get_element -%]
+=item * [% XSD.perl_var_name(XSD.element_name(element)) %]
+[% IF (XSD.perl_var_name(XSD.element_name(element)) == element.get_name); %]
+[% ELSE %]
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
 [% element.get_name %]
+
 [% END %]
+[%     IF element.get_annotation.get_documentation; %]
+[% element.get_annotation.get_documentation %]
+[%     END -%]
+[% END %]
+
+=back
+
+[% END -%]

 [% head1 %] METHODS

@@ -45,6 +67,8 @@ Constructor. The following data structure may be passed to new():

 [% indent = ' '; INCLUDE complexType/POD/structure.tt %]

+[% INCLUDE complexType/POD/attributeSet.tt %]
+
 [% head1 %] AUTHOR

 Generated by SOAP::WSDL
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/all.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/all.tt
@@ -1,7 +1,8 @@
-[% indent %]{
-[%- IF complexType.get_name %] # [% type_prefix %]::[% complexType.get_name %][% END %]
+[% USE XSD -%]
+ {
+[%- IF complexType.get_name %] # [% XSD.create_xsd_name(complexType) %][% END %]
 [%- indent = indent _ '  ';
 FOREACH element = complexType.get_element %]
-[% indent %][% element.get_name %] => [% INCLUDE element/POD/structure.tt -%]
+[% indent %][% XSD.perl_var_name(XSD.element_name(element)) %] => [% INCLUDE element/POD/structure.tt -%]
 [% END %]
 [% indent.replace('\s{2}$', ''); %]}
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/attributeSet.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/attributeSet.tt
@@ -0,0 +1,40 @@
+[% head2 = BLOCK %]=head2[% END -%]
+[% IF (complexType.get_attribute.size) %]
+
+[% head2 %] attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class [% XSD.create_xmlattr_name(complexType) %].
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+[% FOREACH element = complexType.get_attribute;
+    WHILE element.get_ref;
+        element = definitions.first_types.find_attribute(element.expand( element.get_ref ));
+    END; -%]
+=item * [% element.get_name %]
+
+[%- IF (element.get_annotation && element.get_annotation.0.get_documentation) %]
+ [% element.get_annotation.0.get_documentation %]
+[% END; %]
+
+[% IF (type_name=element.get_type);
+    type = definitions.get_types.0.find_type(element.expand(type_name));
+    IF (! type);
+        THROW NOT_FOUND "type " _ type_name _ " for attribute " _ element.get_name _ " not found";
+    END; %]
+This attribute is of type L<[% XSD.create_xsd_name(type) %]|[% XSD.create_xsd_name(type) %]>.
+[% END %]
+
+[%- END -%]
+
+=back
+
+[% END %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/choice.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/choice.tt
@@ -1,9 +1,10 @@
+[%USE XSD -%]
 [% indent %]{
-[%- IF complexType.get_name %] # [% type_prefix %]::[% complexType.get_name %][% END %]
+[%- IF complexType.get_name %] # [% XSD.create_xsd_name(complexType) %][% END %]
 [%- indent = indent _ '  ' %]
 [% indent %]# One of the following elements.
 [% indent %]# No occurance checks yet, so be sure to pass just one...
 [%- FOREACH element = complexType.get_element %]
-[% indent %][% element.get_name %] => [% INCLUDE element/POD/structure.tt -%]
+[% indent %][% XSD.perl_var_name(XSD.element_name(element)) %] => [% INCLUDE element/POD/structure.tt -%]
 [% END %]
 [% indent.replace('\s{2}$', ''); %]}
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/complexContent.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/complexContent.tt
@@ -1,9 +1,12 @@
-[% IF (complexType.get_variety == 'restriction');
+[% IF (complexType.get_derivation == 'restriction');
    INCLUDE complexType/POD/restriction.tt(complexType = complexType);
-ELSIF (complexType.get_variety == 'sequence');
-    THROW NOT_IMPLEMENTED, "${ complexType.get_name } - complexType complexContent extension not implemented yet";
+ELSIF (complexType.get_derivation == 'extension');
+    #THROW NOT_IMPLEMENTED, "${ complexType.get_name } - complexType complexContent extension not implemented yet";
+%]
+ # No documentation generated for complexContent / extension yet
+[%
 ELSE;
-    THROW UNKNOWN, "unknown variety ${ complexType.get_variety }";
+    THROW UNKNOWN, "unknown derivation ${ complexType.get_derivation }";
 END;

 %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/content_model.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/content_model.tt
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/restriction.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/restriction.tt
@@ -1,5 +1,5 @@
 [% indent %]{
-[%- IF complexType.get_name %] # [% type_prefix %]::[% complexType.get_name %][% END %]
+[%- IF complexType.get_name %] # [% XSD.create_xsd_name(complexType) %][% END %]
 [%- indent = indent _ '  ';
 FOREACH element = complexType.get_element %]
 [% indent %][% element.get_name %] => [% INCLUDE element/POD/structure.tt -%]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent.tt
@@ -0,0 +1,9 @@
+[% IF (complexType.get_variety == 'restriction');
+    INCLUDE complexType/POD/simpleContent/restriction.tt(complexType = complexType);
+ELSIF (complexType.get_variety == 'extension');
+    INCLUDE complexType/POD/simpleContent/restriction.tt(complexType = complexType);
+ELSE;
+    THROW UNKNOWN, "unknown variety ${ complexType.get_variety }";
+END;
+
+%]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/extension.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/extension.tt
@@ -0,0 +1 @@
+# No documentation generated for simpleContent / extension yet
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/restriction.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/restriction.tt
@@ -0,0 +1,46 @@
+ {
+    value => $some_value,   # simple perl scalar. See below for restrictions
+ }
+
+NOTE: This type is derived by restriction as complexType with simpleContent.
+Documentation generation for this derivation method is experimental and may
+be erroneous/incomplete.
+
+This clase is derived from [%-
+IF (name = complexType.get_base);
+#    type_name = complexType.expand( name );
+-%]
+[% XSD.create_xsd_name(complexType) %]
+[% ELSE;
+    %] an atomic base type. Unfortunately there's no documentation generated
+on atomic base types' base type yet.[%
+END -%]
+
+SOAP::WSDL's schema implementation does not validate data yet - however, the
+following restrictions apply for this type's value:
+
+[%- FOREACH facet = [
+        'length',
+        'minLength',
+        'maxLength',
+        'totalDigits',
+        'fractionDigits',
+        'minInclusive',
+        'maxInclusive',
+        'minExclusive',
+        'maxExclusive',
+        'pattern',
+        'enumeration'
+    ];
+    IF (facet_method = complexType.can( "get_" _ facet ));
+        facet_value = facet_method( complexType );
+        IF (facet_value.size());
+%]
+ [%         IF (facet == 'enumeration');
+    %]valid values (enumeration)
+[%-         ELSE;
+      facet;
+            END -%]:[% FOREACH value = facet_value %] [% value.get_value; END -%]
+[%      END;
+    END;
+END %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure.tt
@@ -7,7 +7,7 @@ ELSIF (complexType.get_variety == 'group');
 ELSIF (complexType.get_variety == 'choice');
    INCLUDE complexType/POD/choice.tt(complexType = complexType);
 ELSIF (complexType.get_contentModel == 'simpleContent');
-    THROW NOT_IMPLEMENTED, "${ element.get_name } - complexType simpleContent not implemented yet";
+    INCLUDE complexType/POD/structure/simpleContent.tt(complexType = complexType);
 ELSIF (complexType.get_contentModel == 'complexContent');
    INCLUDE complexType/POD/complexContent.tt(complexType = complexType);
-END %],
+END -%],
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/restriction.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/restriction.tt
@@ -0,0 +1,7 @@
+{
+[%- IF complexType.get_name %] # [% XSD.create_xsd_name(complexType) %][% END %]
+[%- indent = indent _ '  ';
+FOREACH element = complexType.get_element %]
+[% indent %][% element.get_name %] => [% INCLUDE element/POD/structure.tt -%]
+[% END %]
+[% indent.replace('\s{2}$', ''); %]}
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/simpleContent.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/simpleContent.tt
@@ -0,0 +1 @@
+ { value => $some_value }
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt
@@ -7,40 +7,57 @@ Class::Std::initialize();
 [%
 atomic_types = {};

-FOREACH element = complexType.get_element %]
-my %[% element.get_name %]_of :ATTR(:get<[% element.get_name %]>);
+FOREACH element = complexType.get_element;
+    name = XSD.perl_var_name(XSD.element_name(element)); %]
+my %[% XSD.perl_name(name) %]_of :ATTR(:get<[% XSD.perl_name(name) %]>);
 [%- END %]

 __PACKAGE__->_factory(
-    [ qw([% FOREACH element = complexType.get_element %]
-        [% element.get_name -%]
+    [ qw([% FOREACH element = complexType.get_element;
+
+    # ugly copied code - macro or plugin method?
+    name = XSD.perl_var_name(XSD.element_name(element)); -%]
+        [% name %]
 [% END %]
    ) ],
    {
-[% FOREACH element = complexType.get_element -%]
-        [% element.get_name %] => \%[% element.get_name %]_of,
+[% FOREACH element = complexType.get_element;
+    # ugly copied code - macro or plugin method?
+    name = XSD.perl_var_name(XSD.element_name(element)); -%]
+        '[% name %]' => \%[% XSD.perl_name(name) %]_of,
 [% END -%]
    },
    {
 [% FOREACH element = complexType.get_element;
-    IF (type = element.get_type);
-        element_type = complexType.expand( type );
-        IF (element_type.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
-        [% element.get_name %] => 'SOAP::WSDL::XSD::Typelib::Builtin::[% element_type.1 %]',
-[%      ELSE -%]
-        [% element.get_name %] => '[% type_prefix %]::[% element_type.1 %]',
-[%      END;
-    ELSE;
+    IF (ref = element.get_ref);
+        ref_element = definitions.first_types.find_element(element.expand( ref ));
+        -%]
+        '[% XSD.perl_var_name(XSD.element_name(ref_element)) %]' => '[% XSD.create_xsd_name(ref_element) %]',
+
+[%    ELSIF (type = element.get_type);
+        element_type = definitions.first_types.find_type(complexType.expand( type ));
+        IF (! element_type);
+            type_name = complexType.expand( type );
+            THROW NOT_FOUND, "${ type_name.0 } ${ type_name.1 } not found";
+        END;
+-%]
+        '[% XSD.perl_var_name(XSD.element_name(element)) %]' => '[% XSD.create_xsd_name(element_type) %]',
+[%  ELSE;
        IF (element.first_simpleType);
            atomic_types.${ element.get_name } = element.first_simpleType;
        ELSIF (element.first_complexType);
            atomic_types.${ element.get_name } = element.first_complexType;
        ELSE;
-            THROW NOT_IMPLEMENTED , "Neither simple nor complex atomic type - don't know what to do with it";
+            THROW NOT_IMPLEMENTED , "Neither simple nor complex atomic type for element ${ element.get_name } - don't know what to do with it";
        END; %]
-    [% element.get_name %] => '[% type_prefix %]::[% complexType.get_name %]::_[% element.get_name %]',
+        '[% XSD.perl_var_name(XSD.element_name(element)) %]' => '[% XSD.create_subpackage_name({ value => element }) %]',
 [%  END;
 END -%]
+    },
+    {
+[% FOREACH element = complexType.get_element; %]
+        '[% XSD.perl_var_name(XSD.element_name(element)); %]' => '[% element.get_name %]',
+[%- END %]
    }
 );

--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/atomicTypes.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/atomicTypes.tt
@@ -1,7 +1,7 @@

 [% FOREACH type IN atomic_types; %]
-
-package [% type_prefix %]::[% complexType.get_name %]::_[% type.key %];
+[%# TODO generate name create_name method %]
+package [% XSD.create_subpackage_name(type); %];
 use strict;
 use warnings;
 {
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/attributeSet.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/attributeSet.tt
@@ -1,40 +1,54 @@
-{ # BLOCK to scope variables
-[%
+[% IF (complexType.get_attribute.size) -%]
+package [% XSD.create_xmlattr_name(complexType) %];
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);

-FOREACH element = complexType.get_attribute %]
+{ # BLOCK to scope variables
+[% FOREACH element = complexType.get_attribute;
+    WHILE element.get_ref;
+        element = definitions.first_types.find_attribute(element.expand( element.get_ref ));
+    END; %]
 my %[% element.get_name %]_of :ATTR(:get<[% element.get_name %]>);
 [%- END %]

 __PACKAGE__->_factory(
-    [ qw([% FOREACH element = complexType.get_attribute %]
+    [ qw(
+[%- FOREACH element = complexType.get_attribute;
+        WHILE element.get_ref;
+            element = definitions.first_types.find_attribute(element.expand( element.get_ref ));
+        END; %]
        [% element.get_name -%]
 [% END %]
    ) ],
    {
-[% FOREACH element = complexType.get_attribute -%]
+[% FOREACH element = complexType.get_attribute;
+        WHILE element.get_ref;
+            element = definitions.first_types.find_attribute(element.expand( element.get_ref ));
+        END; %]
        [% element.get_name %] => \%[% element.get_name %]_of,
 [% END -%]
    },
    {
 [% FOREACH element = complexType.get_attribute;
    IF (type = element.get_type);
-        element_type = complexType.expand( type );
-        IF (element_type.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
-        [% element.get_name %] => 'SOAP::WSDL::XSD::Typelib::Builtin::[% element_type.1 %]',
-[%      ELSE -%]
-        [% element.get_name %] => '[% type_prefix %]::[% element_type.1 %]',
-[%      END;
-    ELSE;
-        IF (element.first_simpleType);
+        element_type = definitions.first_types.find_type(complexType.expand( type ));
+-%]
+        [% element.get_name %] => '[% XSD.create_xsd_name(element_type) %]',
+[%
+    ELSIF (ref = element.get_ref);
+            WHILE element.get_ref;
+                element = definitions.first_types.find_attribute(element.expand( element.get_ref ));
+            END;
+%]
+            [% element.get_name %] => '[% XSD.create_xsd_name(element) %]',
+[%  ELSIF (element.first_simpleType);
            THROW NOT_IMPLEMENTED , "Attributes with atomic simpleType definition are not implemented yet";
            atomic_types.${ element.get_name } = element.first_simpleType;
-        ELSE;
-            THROW NOT_IMPLEMENTED , "Neither simple nor complex atomic type - don't know what to do with it";
-        END; %]
-        [% element.get_name %] => '[% type_prefix %]::[% complexType.get_name %]::_[% element.get_name %]',
-[%  END;
+    ELSE;
+            THROW NOT_IMPLEMENTED , "Neither simple nor complex atomic type for attribute ${ element.get_name } in ${ complexType.get_name } - don't know what to do with it";
+    END;
 END -%]
    }
 );

 } # end BLOCK
+[% END %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/complexContent.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/complexContent.tt
@@ -1,8 +1,16 @@
 [% IF (complexType.get_variety == 'restriction');
    INCLUDE complexType/restriction.tt(complexType = complexType);
+ELSIF (complexType.get_variety == 'extension');
+    INCLUDE complexType/extension.tt(complexType = complexType);
 ELSIF (complexType.get_variety == 'sequence');
    INCLUDE complexType/extension.tt(complexType = complexType);
+ELSIF (complexType.get_variety == 'all');
+    INCLUDE complexType/extension.tt(complexType = complexType);
 ELSE;
-    THROW UNKNOWN, "unknown variety ${ complexType.get_variety }";
+    IF (complexType.get_variety);
+        THROW UNKNOWN, "unknown variety ${ complexType.get_variety }";
+    ELSE -%]
+# empty variety
+[%  END;
 END;
 %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/contentModel.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/contentModel.tt
@@ -1,7 +1,19 @@
+[% IF (complexType.get_attribute.size) -%]
+our $XML_ATTRIBUTE_CLASS = '[% XSD.create_xmlattr_name(complexType) %]';
+[% ELSE -%]
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+[% END %]
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
 [% IF (complexType.get_contentModel == 'simpleContent');
-    THROW NOT_IMPLEMENTED, "${ element.get_name } - complexType simpleContent not implemented yet";
+    INCLUDE complexType/simpleContent.tt(complexType = complexType);
 ELSIF (complexType.get_contentModel == 'complexContent');
    INCLUDE complexType/complexContent.tt(complexType = complexType);
 ELSE;
    INCLUDE complexType/variety.tt(complexType = complexType);
-END %]
+END -%]
+
+[% INCLUDE complexType/attributeSet.tt %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/extension.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/extension.tt
@@ -1,28 +1,77 @@
 [%
+#
+# extension
+#
+# unfortunately, SOAP::WSDL's speed tweaks don't play well with
+# Class::Std's inheritance model.
+#
+# In Class::Std, all properties are stored in the class, and in objects
+# using inheritance in the defining class.
+#
+# As the speed tweaks directly access the class' data without checking
+# inheritance, the simplest way is to resolve complexType extension
+# relationships
+#
+# To capture deep inheritance, extensions must be followed until a non-
+# extension base is found
+#
+# TODO attribute handling is missing
+# TODO sort out some better way to handle inheritance

-base_name=complexType.expand( complexType.get_base );
+element_list = [];
+
+# copy complexType ref
+base_type = complexType;
+base_name = base_type.expand( base_type.get_base );
 base_type = definitions.first_types.find_type( base_name );

-element_from = complexType.get_element;
+# add a use base for first to setup inheritance
+%]
+use base qw([% XSD.create_xsd_name( base_type ) %]);
+[%
+# loop forever
+WHILE (1);
+    IF (complexType.get_variety == 'extension');
+        # wrap statement in IF to avoid printing
+        IF (complexType.set_variety( base_type.get_variety )); END;
+    END;
+    # make a copy. We don't want to modify the original list here...
+    FOREACH element = base_type.get_element.reverse;
+        element_list.unshift(element);
+    END;
+    # get next base type if there is one...
+    IF (base_type.get_base);
+        base_name=base_type.expand( base_type.get_base );
+        # set new base_type
+        base_type = definitions.first_types.find_type( base_name );
+    ELSE;
+        # exit loop if there is none
+        BREAK;
+    END;
+END;

 #
-# Sanity check: All original elements must be noted first
+# and now the new elements...
 #
-element_list = base_type.get_element;
+element_from = complexType.get_element;

 FOREACH element = element_from;
    IF element_list.${ loop.index }.get_name != element.get_name;
        element_list.push( element );
-#        THROW WSDL "${element.get_name} not found at position ${ loop.index } in extension type ${ complexType.get_name }";
    END;
 END;

-complexType.set_element( element_list );
+# set derived element list
+# wrap in IF; END; to prevent it getting printed
+IF ( complexType.set_element( element_list ) ); END;

 -%]
-use base qw([% type_prefix %]::[% base_name.1.replace('\.', '::') %]);
+# Variety: [% complexType.get_variety %]
 [%
-
 INCLUDE complexType/variety.tt(complexType = complexType);

+# restore original element list
+# wrap in IF; END; to prevent it getting printed
+IF ( complexType.set_element( element_from ) ); END;
+
 %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/restriction.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/restriction.tt
@@ -1,7 +1,7 @@
 [% IF (base=complexType.get_base);
-    base_name=complexType.expand(base);
+    base_type=definitions.get_types.0.find_type(complexType.expand(base));
 -%]
-use base qw([% type_prefix %]::[% base_name.1.replace('\.', '::') %]);
+use base qw([% XSD.create_xsd_type(base_type) %]);
 [%
 ELSE;
    THROW NOT_IMPLEMENTED, "restriction without base not supported";
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent.tt
@@ -0,0 +1,9 @@
+[% IF (complexType.get_variety == 'restriction');
+    INCLUDE complexType/restriction.tt(complexType = complexType);
+ELSIF (complexType.get_variety == 'extension');
+    INCLUDE complexType/simpleContent/extension.tt(complexType = complexType);
+    # THROW NOT_IMPLEMENTED, "${ complexType.get_name } - complexType simpleContent extension not implemented yet";
+ELSE;
+    THROW UNKNOWN, "unknown variety ${ complexType.get_variety } in complexType name='${complexType.get_name}'";
+END;
+%]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent/extension.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent/extension.tt
@@ -0,0 +1,11 @@
+[% IF (base=complexType.get_base);
+    base_type=definitions.get_types.0.find_type(complexType.expand(base));
+-%]
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    [% XSD.create_xsd_name(base_type) %]
+);
+[%
+ELSE;
+    THROW NOT_IMPLEMENTED, "extension without base not supported";
+END %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
@@ -7,8 +7,8 @@ ELSIF (complexType.get_variety == 'group');
    THROW NOT_IMPLEMENTED, "${ element.get_name } - complexType group not implemented yet";
 ELSIF (complexType.get_variety == 'choice');
    INCLUDE complexType/all.tt(complexType = complexType);
-ELSIF (complexType.get_variety);
-    THROW NOT_IMPLEMENTED, "Unknown variety ${ complexType.get_variety } in ${ complexType.get_name } (${ element.get_name })";
+#ELSIF (complexType.get_variety);
+#    THROW NOT_IMPLEMENTED, "unknown variety ${ complexType.get_variety } in ${ complexType.get_name } (${ element.get_name })";
 ELSE %]

 # There's no variety - empty complexType
--- a/lib/SOAP/WSDL/Generator/Template/XSD/element.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/element.tt
@@ -1,4 +1,5 @@
-package [% element_prefix %]::[% element.get_name.replace('\.','::') %];
+[% USE XSD(context) %]
+package [% XSD.create_xsd_name(element) %];
 use strict;
 use warnings;

@@ -7,22 +8,29 @@ use warnings;
 sub get_xmlns { '[% element.get_targetNamespace %]' }

 __PACKAGE__->__set_name('[% element.get_name %]');
-__PACKAGE__->__set_nillable([% element.get_nillable %]);
+__PACKAGE__->__set_nillable([% IF (element.get_nillable);
+        IF (element.get_nillable != 'false'); %]1[% ELSE %]0[% END;
+    END;
+ %]);
 __PACKAGE__->__set_minOccurs([% element.get_minOccurs %]);
 __PACKAGE__->__set_maxOccurs([% element.get_maxOccurs %]);
 __PACKAGE__->__set_ref([% IF element.get_ref; %]'[% element.get_ref %]'[% END %]);

-[%- IF (type = element.get_type); -%]
+[%- IF (type_name = element.get_type); -%]
 use base qw(
    SOAP::WSDL::XSD::Typelib::Element
-    [% INCLUDE _type_class.tt( type = type, node = element ) %]
+    [% type = definitions.get_types.0.find_type(element.expand(type_name));
+    XSD.create_xsd_name(type) %]
 );

 }
-[%- ELSIF (ref = element.get_ref); -%]
+[%- ELSIF (ref = element.get_ref);
+    ref_from = ref.split(':');
+-%]
 # element ref="[% ref %]"
 use base qw(
-    [% element_prefix %]::[% ref.split(':').1 %]
+    [% ref_element = definitions.get_types.0.find_element(element.expand(ref));
+    XSD.create_xsd_name( ref_element ); %]
 );

 }
@@ -40,16 +48,9 @@ use base qw(
    SOAP::WSDL::XSD::Typelib::Element
    SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
 [% INCLUDE complexType/contentModel.tt -%]

-}
-
-package [% element_prefix %]::[% element.get_name.replace('\.','::').replace('-','_') %]::_ATTR;
-use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
-[% INCLUDE complexType/attributeSet.tt %]
-
-[% ELSE %]
-
 } # end of BLOCK

 [% END %]
@@ -66,18 +67,52 @@ use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);

 [% head1 %] NAME

-[% element_prefix %]::[% element.get_name %]
+[% XSD.create_xsd_name(element) %]

 [% head1 %] DESCRIPTION

 Perl data type class for the XML Schema defined element
 [% element.get_name %] from the namespace [% element.get_targetNamespace %].

+[% INCLUDE POD/annotation.tt(node = element) %]
+
+[% IF (complexType = element.first_complexType);
+    IF (complexType.get_element); %]
+
+[% head1 %] PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+[%      FOREACH child_element = complexType.get_element -%]
+=item * [% XSD.perl_var_name(XSD.element_name(child_element)) %]
+
+ $element->set_[% XSD.perl_var_name(XSD.element_name(child_element)) %]($data);
+ $element->get_[% XSD.perl_var_name(XSD.element_name(child_element)) %]();
+
+[%          IF (XSD.perl_var_name(XSD.element_name(child_element)) == child_element.get_name); %]
+[%          ELSE %]
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ [% child_element.get_name %]
+
+[%          END %]
+
+=back
+[%      END;
+    END;
+END; -%]
+
+
 [% head1 %] METHODS

 [% head2 %] new

- my $element = [% element_prefix %]::[% element.get_name %]->new($data);
+ my $element = [% XSD.create_xsd_name(element) %]->new($data);

 Constructor. The following data structure may be passed to new():

--- a/lib/SOAP/WSDL/Generator/Template/XSD/element/POD/contentModel.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/element/POD/contentModel.tt
@@ -0,0 +1,8 @@
+[% IF (type = element.get_type);
+ELSIF (simpleType = element.get_simpleType) %]
+This XML element type class has a atomic simpleType as it's base:
+[%
+    INCLUDE simpleType/POD/contentModel.tt(simpleType = simpleType);
+ELSIF (simpleType = element.get_complexType);
+ELSIF (ref_element = element.get_ref);
+END %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/simpleType.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/simpleType.tt
@@ -1,4 +1,5 @@
-package [% type_prefix %]::[% simpleType.get_name.replace('\.','::').replace('-','_') %];
+[% USE XSD(context) -%]
+package [% XSD.create_xsd_name(simpleType) %];
 use strict;
 use warnings;

@@ -20,20 +21,18 @@ __END__

 [% pod %]

-[% head1 %] [% type_prefix %]::[% simpleType.get_name.replace('\.','::').replace('-','_') %]
+[% head1 %] NAME
+
+[% XSD.create_name(simpleType) %]

 [% head1 %] DESCRIPTION

 Perl data type class for the XML Schema defined simpleType
 [% simpleType.get_name %] from the namespace [% simpleType.get_targetNamespace %].

-[% IF (simpleType.get_variety == 'list');
-    INCLUDE simpleType/POD/list.tt;
-ELSIF (simpleType.get_variety == 'restriction');
-    INCLUDE simpleType/POD/restriction.tt;
-ELSE;
-    THROW NOT_IMPLEMENTED "simpleType union not implemented yet in $simpleType.get_name";
-END %]
+[% INCLUDE POD/annotation.tt(node = simpleType) %]
+
+[% INCLUDE simpleType/POD/contentModel.tt(simpleType = simpleType) %]

 [% head1 %] METHODS

--- a/lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/contentModel.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/contentModel.tt
@@ -0,0 +1,9 @@
+[% IF (simpleType.get_variety == 'list');
+    INCLUDE simpleType/POD/list.tt;
+ELSIF (simpleType.get_variety == 'restriction');
+    INCLUDE simpleType/POD/restriction.tt;
+ELSIF (simpleType.get_variety == 'union');
+    INCLUDE simpleType/POD/union.tt;
+ELSE;
+    # THROW NOT_IMPLEMENTED "simpleType " _ simpleType.get_variety _ "not implemented yet in $simpleType.get_name";
+END %]
--- a/lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/list.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/list.tt
@@ -1,13 +1,9 @@
 This clase is derived from
 [%-
 IF (name = simpleType.get_itemType);
-    type_name = simpleType.expand( name );
-    IF (type_name.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
-SOAP::WSDL::XSD::Typelib::Builtin::[% type_name.1 %]
-[% ELSE -%]
-    [% type_prefix %]::[% type_name.1 %]
-[% END;
-ELSE;
+    type = definitions.get_types.0.find_type(simpleType.expand( name )); %]
+    [% XSD.create_xsd_name(type) %]
+[% ELSE;
    # THROW NOT_IMPLEMENTED "atomic simpleType list not implemented yet in $simpleType.get_name";
    %] a atomic base type. Unfortunately there's no documenatation generation for atomic base types yet. [%
 END -%].
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Kutter	3de318be40	import SOAP-WSDL 2.00.06 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00.06 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00.06.tar.gz	2009-12-12 19:48:54 -08:00
Martin Kutter	c2ac24dd0f	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	2009-12-12 19:48:45 -08:00
Martin Kutter	c3e3d1908e	import SOAP-WSDL 2.00.04 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00.04 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00.04.tar.gz	2009-12-12 19:48:44 -08:00
Martin Kutter	e58a27e2ad	import SOAP-WSDL 2.00.03 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00.03 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00.03.tar.gz	2009-12-12 19:48:40 -08:00
Martin Kutter	915ee03cbe	import SOAP-WSDL 2.00.02 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00.02 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00.02.tar.gz	2009-12-12 19:48:35 -08:00
Martin Kutter	745ce925c1	import SOAP-WSDL 2.00.01 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00.01 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00.01.tar.gz	2009-12-12 19:48:32 -08:00
Martin Kutter	0cbf981665	import SOAP-WSDL 2.00_33 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00_33 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00_33.tar.gz	2009-12-12 19:48:28 -08:00
Martin Kutter	51db446428	import SOAP-WSDL 2.00_32 from CPAN git-cpan-module: SOAP-WSDL git-cpan-version: 2.00_32 git-cpan-authorid: MKUTTER git-cpan-file: authors/id/M/MK/MKUTTER/SOAP-WSDL-2.00_32.tar.gz	2009-12-12 19:48:24 -08:00
				`@@ -0,0 +1,2 @@`
				`[% node.get_annotation.0.get_documentation %]`
				`@@ -0,0 +1 @@`
				`# No documentation generated for simpleContent / extension yet`