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

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_32',
+    dist_version       => '2.00_33',
     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,
@@ -27,14 +27,15 @@ $build = Module::Build->new(
         'URI'                     => 0,
         'XML::Parser::Expat'      => 0,
     },
-    buildrequires => {
+    build_requires => {
-        'Class::Std::Fast'        => qv(0.0.5),
+        '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,

Changes

@@ -1,4 +1,4 @@
-Release notes for SOAP::WSDL 2.00_32
+Release notes for SOAP::WSDL 2.00_33
 -------
 
 I'm proud to present a new pre-release version of SOAP::WSDL.
@@ -34,7 +34,41 @@ Features:
 
 The following changes have been made:
 
-2.00_32
+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):

MANIFEST

@@ -3,6 +3,7 @@ benchmark/hello.pl
 benchmark/person.pl
 benchmark/person.xml
 benchmark/person_profile.pl
+benchmark/person_single.pl
 benchmark/XSD/01_anyType.t
 benchmark/XSD/02_anySimpleType.t
 benchmark/XSD/03_string.t
@@ -92,10 +93,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
@@ -104,15 +107,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
@@ -124,6 +135,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
@@ -133,10 +145,13 @@ 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
@@ -169,13 +184,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
@@ -228,12 +257,14 @@ 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
+SOAP-WSDL-2.00_32.tar
 t/001_use.t
 t/002_parse_wsdl.t
 t/003_wsdl_based_serializer.t
@@ -287,6 +318,7 @@ t/acceptance/wsdl/generator_unsupported_test.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
@@ -296,7 +328,10 @@ t/Expat/03_wsdl.t
 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
@@ -331,12 +366,13 @@ t/SOAP/WSDL/Expat/WSDLParser.t
 t/SOAP/WSDL/Factory/Deserializer.t
 t/SOAP/WSDL/Factory/Serializer.t
 t/SOAP/WSDL/Factory/Transport.t
+t/SOAP/WSDL/Generator/attr.pl
 t/SOAP/WSDL/Generator/Template.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_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
@@ -348,9 +384,13 @@ t/SOAP/WSDL/Transport/02_HTTP.t
 t/SOAP/WSDL/Transport/acceptance/test2.xml
 t/SOAP/WSDL/Transport/acceptance/test3.xml
 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

META.yml

@@ -1,6 +1,6 @@
 ---
 name: SOAP-WSDL
-version: 2.00_32
+version: 2.00_33
 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
+  Class::Std::Fast: 0.0.5
-    original: v0.0.5
-    qv: 1
-    version:
-      - 0
-      - 0
-      - 5
   Data::Dumper: 0
   Date::Format: 0
   Date::Parse: 0
@@ -28,10 +22,26 @@ requires:
   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: 0
+  Test::More: 0
+  XML::Parser::Expat: 0
 provides:
   SOAP::WSDL:
     file: lib/SOAP/WSDL.pm
-    version: 2.00_32
+    version: 2.00_33
   SOAP::WSDL::Base:
     file: lib/SOAP/WSDL/Base.pm
     version: 2.00_27
@@ -42,10 +52,10 @@ provides:
     version: 2.00_27
   SOAP::WSDL::Client::Base:
     file: lib/SOAP/WSDL/Client/Base.pm
-    version: 2.00_25
+    version: 2.00_33
   SOAP::WSDL::Definitions:
     file: lib/SOAP/WSDL/Definitions.pm
-    version: 2.00_27
+    version: 2.00_33
   SOAP::WSDL::Deserializer::Hash:
     file: lib/SOAP/WSDL/Deserializer/Hash.pm
     version: 2.00_25
@@ -78,10 +88,14 @@ provides:
     version: 2.00_24
   SOAP::WSDL::Factory::Transport:
     file: lib/SOAP/WSDL/Factory/Transport.pm
-    version: 2.00_31
+    version: 2.00_33
+  SOAP::WSDL::Generator::Iterator::WSDL11:
+    file: lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm
+  SOAP::WSDL::Generator::PrefixResolver:
+    file: lib/SOAP/WSDL/Generator/PrefixResolver.pm
   SOAP::WSDL::Generator::Template:
     file: lib/SOAP/WSDL/Generator/Template.pm
-    version: 2.00_25
+    version: v2.0033
   SOAP::WSDL::Generator::Template::Plugin::XSD:
     file: lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm
   SOAP::WSDL::Generator::Template::XSD:
@@ -129,7 +143,7 @@ provides:
     version: 2.00_27
   SOAP::WSDL::Server::CGI:
     file: lib/SOAP/WSDL/Server/CGI.pm
-    version: 2.00_27
+    version: 2.00_33
   SOAP::WSDL::Service:
     file: lib/SOAP/WSDL/Service.pm
   SOAP::WSDL::Transport::HTTP:
@@ -145,25 +159,64 @@ provides:
     version: 2.00_31
   SOAP::WSDL::Types:
     file: lib/SOAP/WSDL/Types.pm
+  SOAP::WSDL::XSD::Annotation:
+    file: lib/SOAP/WSDL/XSD/Annotation.pm
+    version: 2.00_33
   SOAP::WSDL::XSD::Attribute:
     file: lib/SOAP/WSDL/XSD/Attribute.pm
     version: 2.00_29
+  SOAP::WSDL::XSD::AttributeGroup:
+    file: lib/SOAP/WSDL/XSD/AttributeGroup.pm
+    version: 2.00_29
   SOAP::WSDL::XSD::Builtin:
     file: lib/SOAP/WSDL/XSD/Builtin.pm
   SOAP::WSDL::XSD::ComplexType:
     file: lib/SOAP/WSDL/XSD/ComplexType.pm
-    version: 2.00_29
+    version: 2.00_33
   SOAP::WSDL::XSD::Element:
     file: lib/SOAP/WSDL/XSD/Element.pm
     version: 2.00_25
+  SOAP::WSDL::XSD::Enumeration:
+    file: lib/SOAP/WSDL/XSD/Enumeration.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::Group:
+    file: lib/SOAP/WSDL/XSD/Group.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::Length:
+    file: lib/SOAP/WSDL/XSD/Length.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::MaxExclusive:
+    file: lib/SOAP/WSDL/XSD/MaxExclusive.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::MaxInclusive:
+    file: lib/SOAP/WSDL/XSD/MaxInclusive.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::MaxLength:
+    file: lib/SOAP/WSDL/XSD/MaxLength.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::MinExclusive:
+    file: lib/SOAP/WSDL/XSD/MinExclusive.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::MinInclusive:
+    file: lib/SOAP/WSDL/XSD/MinInclusive.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::MinLength:
+    file: lib/SOAP/WSDL/XSD/MinLength.pm
+    version: 2.00_33
+  SOAP::WSDL::XSD::Pattern:
+    file: lib/SOAP/WSDL/XSD/Pattern.pm
+    version: 2.00_33
   SOAP::WSDL::XSD::Schema:
     file: lib/SOAP/WSDL/XSD/Schema.pm
-    version: 2.00_25
+    version: 2.00_33
   SOAP::WSDL::XSD::Schema::Builtin:
     file: lib/SOAP/WSDL/XSD/Schema/Builtin.pm
   SOAP::WSDL::XSD::SimpleType:
     file: lib/SOAP/WSDL/XSD/SimpleType.pm
     version: 2.00_25
+  SOAP::WSDL::XSD::TotalDigits:
+    file: lib/SOAP/WSDL/XSD/TotalDigits.pm
+    version: 2.00_33
   SOAP::WSDL::XSD::Typelib::Attribute:
     file: lib/SOAP/WSDL/XSD/Typelib/Attribute.pm
     version: 2.00_29
@@ -270,7 +323,7 @@ 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_33
   SOAP::WSDL::XSD::Typelib::Element:
     file: lib/SOAP/WSDL/XSD/Typelib/Element.pm
     version: 2.00_29
@@ -278,6 +331,9 @@ provides:
     file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
   SOAP::WSDL::XSD::Typelib::SimpleType::restriction:
     file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
+  SOAP::WSDL::XSD::WhiteSpace:
+    file: lib/SOAP/WSDL/XSD/WhiteSpace.pm
+    version: 2.00_33
 generated_by: Module::Build version 0.2808
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

MIGRATING

@@ -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 
+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 
+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

Makefile.PL

@@ -1,30 +1,5 @@
 # Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
+    use Module::Build::Compat 0.02;
-    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 $@;
     
     Module::Build::Compat->run_build_pl(args => \@ARGV);
     require Module::Build;

README

@@ -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,12 @@ 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 
+Note that Module::Build is the recommended installer - make will not run
 all tests provided with SOAP-WSDL.

benchmark/person.pl

@@ -39,8 +39,7 @@ $lite->on_action( sub { 'http://www.example.org/benchmark/ListPerson' } );
 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 = 70;
-my $count = 100;
 my @data = ();
 my $n = 0;
 print "Benchmark conducted with
@@ -54,22 +53,22 @@ 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({}) },
+#    'SOAP::WSDL' => sub { my $result = $soap->ListPerson({}) },
-    'XML::Compile' => sub { my $result = $call->() },
+#    '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::Lite'	=> sub { my $som = $lite->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({}) },
+#    'SOAP::WSDL' => sub { push @data, $soap->ListPerson({}) },
-    'XML::Compile' => sub { push @data, $call->() },
+#    'XML::Compile' => sub { push @data, $call->() },
     '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') },
+#	'SOAP::Lite'	=> sub { push @data, $lite->call('ListPerson') },
 };
 
 @data = ();
@@ -77,10 +76,10 @@ print "\nBenchmark $n: Play it again, Sam\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->() },
+#    'XML::Compile' => sub { push @data, $call->() },
 #    'SOAP::Lite' => sub { push @data, $deserializer->deserialize( MyData::xml() )}
-	'SOAP::Lite'	=> sub { push @data, $lite->call('ListPerson') },
+#	'SOAP::Lite'	=> sub { push @data, $lite->call('ListPerson') },
 };
 

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({})
+}

bin/wsdl2perl.pl

@@ -19,6 +19,7 @@ my %opt = (
   proxy => undef,
   generator => 'XSD',
   server => 0,
+  namespace => 0,
 );
 
 {   # a block just to scope "no warnings"
@@ -34,12 +35,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);
     };
@@ -61,6 +64,7 @@ GetOptions(\%opt,
     password=s
     generator=s
     server
+    namespaces|n
   )
 );
 

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({

lib/SOAP/WSDL.pm

@@ -14,7 +14,7 @@ use Class::Std::Fast;
 use SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType;
 use LWP::UserAgent;
 
-our $VERSION= '2.00_32';
+our $VERSION= '2.00_33';
 
 my %no_dispatch_of      :ATTR(:name<no_dispatch>);
 my %wsdl_of             :ATTR(:name<wsdl>);
@@ -330,6 +330,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(
@@ -522,6 +533,28 @@ 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.
+
 =head1 Differences to SOAP::Lite
 
 =head2 readable
@@ -604,6 +637,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,14 +662,16 @@ 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
@@ -712,20 +759,29 @@ 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.
 
 Andreas 'ac0v' Specht constantly asked for better performance.
 
-JT Justman provided early feedback for the 2.xx pre-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.
+
+CPAN Testers have provided most valuable (automated) feedback. Thanks.
 
 Numerous people sent me their real-world WSDL files for testing. Thank you.
 
 Paul Kulchenko and Byrne Reese wrote and maintained SOAP::Lite and
 thus provided a base (and counterpart) for SOAP::WSDL.
 
+Mark Overmeer wrote XML::Compile::SOAP - competition is good for business.
+
 =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 +792,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 534 $
+ $Rev: 583 $
  $LastChangedBy: kutterma $
- $Id: WSDL.pm 534 2008-02-14 17:07:18Z kutterma $
+ $Id: WSDL.pm 583 2008-03-24 07:44:06Z kutterma $
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL.pm $
 
 =cut
-

lib/SOAP/WSDL/Base.pm

@@ -7,16 +7,28 @@ use Carp qw(croak carp confess);
 
 our $VERSION='2.00_27';
 
-my %id_of :ATTR(:name<id> :default<()>);
+my %id_of               :ATTR(:name<id> :default<()>);
-my %name_of :ATTR(:name<name> :default<()>);
+my %lang_of             :ATTR(:name<lang> :default<()>);
-my %documentation_of :ATTR(:name<documentation> :default<()>);
+my %name_of             :ATTR(:name<name> :default<()>);
-my %targetNamespace_of :ATTR(:name<targetNamespace> :default<()>);
+my %documentation_of    :ATTR(:name<documentation> :default<()>);
-my %xmlns_of :ATTR(:name<xmlns> :default<{}>);
+my %annotation_of       :ATTR(:name<annotation> :default<()>);
-my %parent_of :ATTR(:name<parent> :default<()>);
+my %targetNamespace_of  :ATTR(:name<targetNamespace> :default<()>);
+my %xmlns_of            :ATTR(:name<xmlns> :default<{}>);
+my %parent_of           :ATTR(:name<parent> :default<()>);
+
+my %namespaces_of       :ATTR(:default<{}>);
+
+sub namespaces {
+    return shift->get_xmlns();
+}
 
 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 {
@@ -87,7 +99,12 @@ sub AUTOMETHOD {
             return $result_ref->[0];
         };
     }
-    confess "$subname not found in class " . ref $self;
+
+    # return if called from can();
+    my @caller = caller(2);
+    return if ($caller[3] eq 'Class::Std::Fast::__ANON__');
+    # confess "$subname not found in class " . ref $self;
+    return;
 }
 
 sub init {
@@ -109,8 +126,8 @@ sub init {
 }
 
 sub expand {
-    my ($self, , $qname) = @_;
+    my ($self, $qname) = @_;
-    my $ns_of = $self->get_xmlns();
+    my $ns_of = $self->namespaces();
     if (not $qname=~m{:}xm) {
         die "un-prefixed element name <$qname> found, but no default namespace set\n"
             if not defined $ns_of->{ '#default' };

lib/SOAP/WSDL/Client/Base.pm

@@ -4,21 +4,21 @@ use warnings;
 use base 'SOAP::WSDL::Client';
 use Scalar::Util qw(blessed);
 
-our $VERSION = '2.00_25';
+our $VERSION = '2.00_33';
 
 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 } }) {
@@ -78,9 +78,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 501 $
+ $Rev: 542 $
  $LastChangedBy: kutterma $
- $Id: Base.pm 501 2008-01-26 20:23:32Z kutterma $
+ $Id: Base.pm 542 2008-02-18 09:38:06Z kutterma $
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client/Base.pm $
 
 =cut

lib/SOAP/WSDL/Definitions.pm

@@ -9,22 +9,22 @@ use List::Util qw(first);
 use Class::Std::Fast::Storable;
 use base qw(SOAP::WSDL::Base);
 
-our $VERSION='2.00_27';
+our $VERSION='2.00_33';
 
-my %types_of    :ATTR(:name<types>      :default<[]>);
+my %types_of        :ATTR(:name<types>      :default<[]>);
-my %message_of  :ATTR(:name<message>    :default<()>);
+my %message_of      :ATTR(:name<message>    :default<[]>);
-my %portType_of :ATTR(:name<portType>   :default<()>);
+my %portType_of     :ATTR(:name<portType>   :default<[]>);
-my %binding_of  :ATTR(:name<binding>    :default<()>);
+my %binding_of      :ATTR(:name<binding>    :default<[]>);
-my %service_of  :ATTR(:name<service>    :default<()>);
+my %service_of      :ATTR(:name<service>    :default<[]>);
-my %namespace_of  :ATTR(:name<namespace> :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,
+    binding     => \%binding_of,
-    message => \%message_of,
+    message     => \%message_of,
-    portType => \%portType_of,
+    portType    => \%portType_of,
-    service => \%service_of,
+    service     => \%service_of,
 );
 
 # Function factory - we could be writing this method for all %attribute
@@ -118,9 +118,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 477 $
+ $Rev: 549 $
  $LastChangedBy: kutterma $
- $Id: Definitions.pm 477 2007-12-24 10:23:52Z kutterma $
+ $Id: Definitions.pm 549 2008-02-20 10:14:26Z kutterma $
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Definitions.pm $
 
 =cut

lib/SOAP/WSDL/Expat/Base.pm

@@ -10,7 +10,9 @@ our $VERSION = '2.00_32';
 
 sub new {
     my ($class, $arg_ref) = @_;
-    my $self = {};
+    my $self = {
+        data => undef,
+    };
     bless $self, $class;
 
     $self->set_user_agent($arg_ref->{ user_agent })

lib/SOAP/WSDL/Expat/MessageParser.pm

@@ -24,7 +24,8 @@ sub new {
     };
 
     bless $self, $class;
-    $self->load_classes() if ($args->{ class_resolver });
+    $self->load_classes() if ($args->{ class_resolver })
+        && ! exists $LOADED_OF{ $self->{ class_resolver } };
     return $self;
 }
 
@@ -32,7 +33,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 };
 }
@@ -40,8 +42,6 @@ sub class_resolver {
 sub load_classes {
     my $self = shift;
 
-    return if $LOADED_OF{ $self->{ class_resolver } };
-
     for (values %{ $self->{ class_resolver }->get_typemap }) {
         no strict qw(refs);
         my $class = $_;
@@ -295,8 +295,8 @@ the same terms as perl itself
 
  $Id: $
 
- $LastChangedDate: 2008-02-02 10:19:45 +0100 (Sa, 02 Feb 2008) $
+ $LastChangedDate: 2008-03-29 22:38:55 +0100 (Sa, 29 Mrz 2008) $
- $LastChangedRevision: 516 $
+ $LastChangedRevision: 585 $
  $LastChangedBy: kutterma $
 
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageParser.pm $

lib/SOAP/WSDL/Expat/WSDLParser.pm

@@ -17,6 +17,9 @@ sub _import_children {
     no strict qw(refs);
     my $value_ref = $imported->$get_method();
     if ($value_ref) {
+        #print $self->get_uri(), "\n";
+        #use Data::Dumper;
+        #print Data::Dumper::Dumper $value_ref;
         $value_ref = [ $value_ref ] if (not ref $value_ref eq 'ARRAY');
         # set xmlns - can be different from parent
         for (@{ $value_ref }) {
@@ -25,9 +28,25 @@ sub _import_children {
                 if ( ($import_namespace ne $targetNamespace) && !  $_->get_targetNamespace);
             # update parent...
             $_->set_parent( $importer );
+            $importer->$push_method($_);
         }
         # push elements into importing WSDL
-        $importer->$push_method(@{ $value_ref });
+        #$importer->$push_method(@{ $value_ref })
+        #    if @{ $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() };
+    while (my ($prefix, $url) = each %xmlns_of) {
+        $importer_ns_of->{ $prefix } = $url;
     }
 }
 
@@ -38,10 +57,18 @@ sub xml_schema_import {
     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);
+    my $imported = $parser->parse_uri($uri);
 
-    for my $name ( qw(type element group) ) {
+    # might already be imported - parse_uri just returns in this case
-        $self->_import_children( $name, $import, $schema, $import_namespace);
+    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);
     }
 }
 
@@ -53,9 +80,18 @@ sub wsdl_import {
     my $import_namespace = $attr_of{ namespace };
     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);
     }
 }
 
@@ -243,10 +279,10 @@ the same terms as perl itself
 
 =head1 Repository information
 
- $Id: $
+ $Id: WSDLParser.pm 549 2008-02-20 10:14:26Z kutterma $
 
- $LastChangedDate: 2008-02-14 18:07:18 +0100 (Do, 14 Feb 2008) $
+ $LastChangedDate: 2008-02-20 11:14:26 +0100 (Mi, 20 Feb 2008) $
- $LastChangedRevision: 534 $
+ $LastChangedRevision: 549 $
  $LastChangedBy: kutterma $
 
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/WSDLParser.pm $

lib/SOAP/WSDL/Factory/Transport.pm

@@ -2,7 +2,7 @@ package SOAP::WSDL::Factory::Transport;
 use strict;
 use warnings;
 
-our $VERSION='2.00_31';
+our $VERSION='2.00_33';
 
 # class data
 my %registered_transport_of = ();
@@ -12,7 +12,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',
@@ -240,9 +240,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 524 $
+ $Rev: 579 $
  $LastChangedBy: kutterma $
- $Id: Transport.pm 524 2008-02-10 23:24:43Z kutterma $
+ $Id: Transport.pm 579 2008-03-09 18:39:24Z kutterma $
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Transport.pm $
 
 =cut

lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm

@@ -0,0 +1,268 @@
+package SOAP::WSDL::Generator::Iterator::WSDL11;
+use strict; use warnings;
+use Class::Std::Fast;
+
+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();
+                    $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, but 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

lib/SOAP/WSDL/Generator/PrefixResolver.pm

@@ -0,0 +1,113 @@
+package SOAP::WSDL::Generator::PrefixResolver;
+use strict; use warnings;
+
+use Class::Std::Fast::Storable;
+
+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) = @_;
+    return $prefix_of{ $$self }->{ $type }
+        if not defined($namespace);
+    return $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 }
+        );
+
+}
+
+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) prefis. 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.
+
+Note that 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.
+
+=back
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2008 Martin Kutter.
+
+This library is free software. 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

lib/SOAP/WSDL/Generator/Template.pm

@@ -2,20 +2,25 @@ package SOAP::WSDL::Generator::Template;
 use strict;
 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_33);
 
 my %tt_of               :ATTR(:get<tt>);
-my %definitions_of      :ATTR(:name<definitions>    :default<()>);
+my %definitions_of      :ATTR(:name<definitions>        :default<()>);
-my %server_prefix_of    :ATTR(:name<server_prefix> :default<MyServer>);
+my %server_prefix_of    :ATTR(:name<server_prefix>      :default<MyServer>);
-my %interface_prefix_of :ATTR(:name<interface_prefix> :default<MyInterfaces>);
+my %interface_prefix_of :ATTR(:name<interface_prefix>   :default<MyInterfaces>);
-my %typemap_prefix_of   :ATTR(:name<typemap_prefix> :default<MyTypemaps>);
+my %typemap_prefix_of   :ATTR(:name<typemap_prefix>     :default<MyTypemaps>);
-my %type_prefix_of      :ATTR(:name<type_prefix>    :default<MyTypes>);
+my %type_prefix_of      :ATTR(:name<type_prefix>        :default<MyTypes>);
-my %element_prefix_of   :ATTR(:name<element_prefix> :default<MyElements>);
+my %element_prefix_of   :ATTR(:name<element_prefix>     :default<MyElements>);
-my %INCLUDE_PATH_of     :ATTR(:name<INCLUDE_PATH>   :default<()>);
+my %attribute_prefix_of :ATTR(:name<attribute_prefix>   :default<MyAttributes>);
-my %EVAL_PERL_of        :ATTR(:name<EVAL_PERL>      :default<0>);
+my %INCLUDE_PATH_of     :ATTR(:name<INCLUDE_PATH>       :default<()>);
-my %RECURSION_of        :ATTR(:name<RECURSION>      :default<0>);
+my %EVAL_PERL_of        :ATTR(:name<EVAL_PERL>          :default<0>);
-my %OUTPUT_PATH_of      :ATTR(:name<OUTPUT_PATH>    :default<.>);
+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) = @_;
@@ -39,31 +44,28 @@ sub _process :PROTECTED {
     $tt->process( $template,
     {
         context => {
-            namespace_prefix_map => {
+            prefix_resolver => $prefix_resolver_class_of{ $$self }->new({
-                'http://www.w3.org/2001/XMLSchema' => 'SOAP::WSDL::XSD::Typelib::Builtin',
+                namespace_prefix_map => {
-            },
+                    'http://www.w3.org/2001/XMLSchema' => 'SOAP::WSDL::XSD::Typelib::Builtin',
-            namespace_map => {
+                },
-            },
+                namespace_map => {
-            prefix => {
+                },
-                interface => $self->get_interface_prefix,
+                prefix => {
-                element => $self->get_element_prefix,
+                    interface => $self->get_interface_prefix,
-                server => $self->get_server_prefix,
+                    element => $self->get_element_prefix,
-                type => $self->get_type_prefix,
+                    attribute => $self->get_attribute_prefix,
-                typemap => $self->get_typemap_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->error();
+        or croak $INCLUDE_PATH_of{ $ident }, '\\', $template, ' ', $tt->error();
 }
 
 1;

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

@@ -1,61 +1,196 @@
 package SOAP::WSDL::Generator::Template::Plugin::XSD;
 use strict;
 use warnings;
-
+use Carp qw(confess);
 use Class::Std::Fast::Storable constructor => 'none';
 
-my %namespace_prefix_map_of    :ATTR(:name<namespace_prefix_map>  :default<{}>);
+my %namespace_prefix_map_of :ATTR(:name<namespace_prefix_map>   :default<{}>);
-my %namespace_map_of            :ATTR(:name<namespace_map>  :default<{}>);
+my %namespace_map_of        :ATTR(:name<namespace_map>          :default<{}>);
-my %prefix_of                   :ATTR(:name<prefix> :default<()>);
+my %prefix_of               :ATTR(:name<prefix>                 :default<()>);
+my %prefix_resolver_of      :ATTR(:name<prefix_resolver>        :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;
-    use Data::Dumper;
+#    $self->set_namespace_map( $stash->{ context }->{ namespace_map });
-    # die Data::Dumper::Dumper $stash->{ context };
+#    $self->set_namespace_prefix_map( $stash->{ context }->{ namespace_prefix_map });
-    $self->set_namespace_map( $stash->{ context }->{ namespace_map });
+#    $self->set_prefix( $stash->{ context }->{ prefix });
-    $self->set_namespace_prefix_map( $stash->{ context }->{ namespace_prefix_map });
+    $self->set_prefix_resolver( $stash->{ context }->{ prefix_resolver });
-    $self->set_prefix( $stash->{ context }->{ prefix });
     return $self;       # returns 'MyPlugin'
 }
 
 sub new {
-    return shift;
+    return shift if ref $_[0];
+
+    my ($class, $arg_ref) = @_;
+
+    my $self = bless \do { my $o = Class::Std::Fast::ID() }, $class;
+#    $self->set_namespace_map( $arg_ref->{ namespace_map });
+#    $self->set_namespace_prefix_map( $arg_ref->{ namespace_prefix_map });
+#    $self->set_prefix( $arg_ref->{ prefix });
+    $self->set_prefix_resolver( $arg_ref->{ prefix_resolver });
+    return $self;       # returns 'MyPlugin'
 }
 
 sub _get_prefix {
-    my ($self, $type, $namespace) = @_;
+    my ($self, $type, $node) = @_;
-    return $namespace_prefix_map_of{ $$self }->{ $namespace }
+    my $namespace = defined ($node)
-        || ( ($namespace_map_of{ $$self }->{ $namespace })
+        ? ref($node)
-            ? join ('::', $prefix_of{ $$self }->{ $type }, $namespace_map_of{ $$self }->{ $namespace })
+            ? $node->get_targetNamespace
-            : $prefix_of{ $$self }->{ $type }
+            : $node
-        )
+        : undef;
-        || $prefix_of{ $$self }->{ $type };
+    return $self->get_prefix_resolver->resolve_prefix(
+        $type,
+        $namespace,
+        ref($node)
+            ? $node
+            : undef
+     );
 }
 
-sub get_element_prefix {
+#sub _get_prefix {
-    shift->_get_prefix( 'element', shift );
+#    my ($self, $type, $namespace) = @_;
+#    return $prefix_of{ $$self }->{ $type }
+#        if not defined($namespace);
+#    return $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 }
+#        );
+#}
+
+sub create_xsd_name {
+    my ($self,$element) = @_;
+    my $name = $self->_resolve_prefix($element) . '::'
+        . $element->get_name();
+    return $self->perl_name( $name );
 }
 
-sub get_interface_prefix {
+sub create_typemap_name {
-    shift->_get_prefix( 'interface', shift );
+    my ($self, $node) = @_;
+    my $name = $self->_get_prefix('typemap') . '::'
+        . $node->get_name();
+    return $self->perl_name( $name );
 }
 
-sub get_server_prefix {
+sub create_server_name {
-    shift->_get_prefix( 'server', shift );
+    my ($self, $server, $port) = @_;
+    my $port_name = $port->get_name();
+    $port_name =~s{\A (?:.+)\. ([^\.]+) \z}{$1}x;
+    my $name = join('::',
+        $self->_get_prefix('server', $server),
+        $server->get_name(),
+        $port_name
+    );
+    return $self->perl_name( $name );
 }
 
-sub get_type_prefix {
+sub create_interface_name {
-    # die "WIX";
+    my ($self, $server, $port) = @_;
-    shift->_get_prefix( 'type', shift );
+    my $port_name = $port->get_name();
+    $port_name =~s{\A (?:.+)\. ([^\.]+) \z}{$1}x;
+    my $name = join('::',
+        $self->_get_prefix('interface', $server),
+        $server->get_name(),
+        $port_name
+    );
+    return $self->perl_name( $name );
 }
 
-sub get_typemap_prefix {
+sub _resolve_prefix {
-    shift->_get_prefix( 'typemap', shift );
+    my ($self, $node) = @_;
+    confess "no node" if not $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 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
+    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 error {}
 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
+

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

@@ -9,10 +9,11 @@ our $VERSION = q{2.00_27};
 
 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 %output_of                   :ATTR(:name<output> :default<()>);
-my %typemap_of :ATTR(:name<typemap> :default<({})>);
+my %typemap_of                  :ATTR(:name<typemap> :default<({})>);
 
 sub BUILD {
     my ($self, $ident, $arg_ref) = @_;
@@ -50,89 +51,76 @@ 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 $prefix_method = delete $arg_ref->{ prefix_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->can($prefix_method)->($self),
+                    $service->get_name(),
+                    $port_name,
+            );
+            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 ($self, $arg_ref) = @_;
-    my $ident = ident $self;
+    $arg_ref->{ template_name } = 'Server.tt';
-    my $arg_ref = shift;
+    $arg_ref->{ prefix_method } = 'get_server_prefix';
-    for my $service (@{ $self->get_definitions->get_service }) {
+    $self->_generate_interface($arg_ref);
-        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');
-        }
-    }
 }
 
-sub generate_interface {
+sub generate_client {
-    my $self = shift;
+    my ($self, $arg_ref) = @_;
-    my $ident = ident $self;
+    $arg_ref->{ template_name } = 'Interface.tt';
-    my $arg_ref = shift;
+    $arg_ref->{ prefix_method } = 'get_interface_prefix';
-    for my $service (@{ $self->get_definitions->get_service }) {
+    $self->_generate_interface($arg_ref);
-        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_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,10 +132,35 @@ sub generate_typemap {
             'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
             'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
             %{ $typemap_of{ident $self }},
-        }
+        },
+        resolver => 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 => {
+                    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,
+                }
+            })
+        }),
     });
+
+    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() );
@@ -171,6 +184,14 @@ sub _generate_filename :PRIVATE {
     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_attribute_prefix(), $attribute->get_name() );
+    $self->_process('attribute.tt', { attribute => $attribute } , $output);
+}
+
 sub visit_XSD_Element {
     my ($self, $element) = @_;
     my $output = defined $output_of{ ident $self }

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

@@ -1,8 +1,5 @@
 [% USE XSD -%]
-[% interface_name = interface_prefix _ '::'
+[% interface_name = XSD.create_interface_name(service, port) -%]
-    _ service.get_name.replace('\.', '::') _ '::'
-    _ port.get_name.replace('^.+\.','');
-interface_name = interface_name.replace('-','_'); -%]
 package [% interface_name %];
 use strict;
 use warnings;
@@ -11,20 +8,20 @@ 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('-', '_') %]
+require [% XSD.create_typemap_name(service) %]
-    if not [% typemap_prefix %]::[% service.get_name.replace('\.', '::').replace('-', '_') %]->can('get_class');
+    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};
 }
 
 [%      binding = definitions.find_binding( port.expand( port.get_binding ) );
         FOREACH operation = binding.get_operation;
 %][% INCLUDE Interface/Operation.tt %]
-[%
 
+[%
         END;
 %]
 
@@ -83,7 +80,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 %]

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 $part_from = $stash->{ message }->get_part();
-    my $type_prefix = $stash->{ type_prefix };
-    my $element_prefix = $stash->{ element_prefix };
 
     my @body_part_from = split m{\s}, $item->get_parts;
 
@@ -25,14 +23,17 @@
                 my $name;
                 ($name = $part->get_element)
                     ? do {
-                        $name =~s{ ^[^:]+: }{}xms;
+                        my $element = $def->first_types->find_element($part->expand($name));
-                        $element_prefix . '::' . $name;
+                        my $resolver = $context->plugin('XSD');
-                        }
+                        $resolver->create_xsd_name($element);
+
+                    }
                     : ($name = $part->get_type)
                         ? do {
-                            $name =~s{ ^[^:]+: }{}xms;
+                            my $element = $def->first_types->find_type($part->expand($name));
-                            $type_prefix . '::' . $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;
+                    my $element = $def->first_types->find_element($part->expand($name));
-                    "$element_prefix\::$name"
+                    my $resolver = $context->plugin('XSD');
-                    }
+                    $resolver->create_xsd_name($element);
+               }
                : ($name = $part->get_type)
                     ? do {
-                        $name =~s{ ^[^:]+: }{}xms;
+                            my $element = $def->first_types->find_type($part->expand($name));
-                        "$type_prefix\::$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 %]',
+[% IF item.get_use != 'literal';
-            namespace => '[% item.get_namespace %]',
+    THROW NOT_SUPPORTED "Body: SOAP::WSDL supports literal encoding only - ${ item.get_use } found";
-            encodingStyle => '[% item.get_encodingStyle %]',
+END %]
-            parts => [qw( [% parts.join(' ') %] )],
+           'use'            => '[% item.get_use %]',
+            namespace       => '[% item.get_namespace %]',
+            encodingStyle   => '[% item.get_encodingStyle %]',
+            parts           =>  [qw( [% parts.join(' ') %] )],

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

@@ -19,19 +19,25 @@
         my $name;
         ($name = $part->get_element)
             ? do {
-                $name =~s{ ^[^:]+: }{}xms;
+                    my $element = $def->first_types->find_element($part->expand($name));
-                $element_prefix . '::' . $name;
+                    my $resolver = $context->plugin('XSD');
+                    $resolver->create_xsd_name($element);
                 }
             : ($name = $part->get_type)
                 ? do {
-                    $name =~s{ ^[^:]+: }{}xms;
+                        my $element = $def->first_types->find_type($part->expand($name));
-                    $type_prefix . '::' . $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 %]',

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 ); %]
         },

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.
+

lib/SOAP/WSDL/Generator/Template/XSD/POD/annotation.tt

@@ -0,0 +1,2 @@
+[% node.get_annotation.0.get_documentation %]
+

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

@@ -1,7 +1,6 @@
-[% server_name = server_prefix _ '::'
+[% USE XSD;
-    _ service.get_name.replace('\.', '::') _ '::'
+server_name = XSD.create_server_name(service, port);
-    _ port.get_name.replace('^.+\.','');
+-%]
-server_name = server_name.replace('-','_'); -%]
 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('\.', '::') %]
+require [% XSD.create_typemap_name(service) %]
-    if not [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]->can('get_class');
+    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{ ${ shift @_ } }->handle(@_);
 }
 
 1;

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; %]

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
 

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 -%]

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
+

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

@@ -1,13 +1,15 @@
-[% USE XSD(context) -%]
+[% USE XSD -%]
-package [% type_prefix %]::[% complexType.get_name.replace('\.','::').replace('-','_') %];
+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...
 #-%]
 
-[% INCLUDE complexType/attributeSet.tt %]
+[% INCLUDE complexType/contentModel.tt %]
+
 1;
 
 [%# work around for CPAN's indexer, which gets disturbed by pod in templates -%]
@@ -20,22 +22,35 @@ use warnings;
 
 [% 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 -%]
- [% element.get_name %]
+=item * [% element.get_name %]
+
+[%     IF element.get_annotation.get_documentation; %]
+[% element.get_annotation.get_documentation %]
+[%     END -%]
 [% END %]
 
+=back
+
+[% END -%]
+
 [% head1 %] METHODS
 
 [% head2 %] new
@@ -44,6 +59,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

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/all.tt

@@ -1,5 +1,5 @@
-[% indent %]{
+ {
-[%- IF complexType.get_name %] # [% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% 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 -%]

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/attributeSet.tt

@@ -0,0 +1,34 @@
+[% 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 -%]
+=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 -%]
+[% END %]

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/choice.tt

@@ -1,5 +1,5 @@
 [% indent %]{
-[%- IF complexType.get_name %] # [% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% 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...

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/restriction.tt

@@ -1,5 +1,5 @@
 [% indent %]{
-[%- IF complexType.get_name %] # [% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% 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 -%]

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent.tt

@@ -1,10 +1,7 @@
 [% IF (complexType.get_variety == 'restriction');
-    INCLUDE complexType/POD/restriction.tt(complexType = complexType);
+    INCLUDE complexType/POD/simpleContent/restriction.tt(complexType = complexType);
 ELSIF (complexType.get_variety == 'extension');
-    #THROW NOT_IMPLEMENTED, "${ complexType.get_name } - complexType complexContent extension not implemented yet";
+    INCLUDE complexType/POD/simpleContent/restriction.tt(complexType = complexType);
-%]
- # No documentation generated for complexContent / extension yet
-[%
 ELSE;
     THROW UNKNOWN, "unknown variety ${ complexType.get_variety }";
 END;

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/extension.tt

@@ -0,0 +1 @@
+# No documentation generated for simpleContent / extension yet

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 %]

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');
-    INCLUDE complexType/POD/simpleContent.tt(complexType = complexType);
+    INCLUDE complexType/POD/structure/simpleContent.tt(complexType = complexType);
 ELSIF (complexType.get_contentModel == 'complexContent');
     INCLUDE complexType/POD/complexContent.tt(complexType = complexType);
-END %],
+END -%],

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}$', ''); %]}

lib/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/simpleContent.tt

@@ -0,0 +1 @@
+ { value => $some_value }

lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt

@@ -8,7 +8,7 @@ Class::Std::initialize();
 atomic_types = {};
 
 FOREACH element = complexType.get_element %]
-my %[% element.get_name %]_of :ATTR(:get<[% element.get_name %]>);
+my %[% XSD.perl_name(element.get_name) %]_of :ATTR(:get<[% XSD.perl_name(element.get_name) %]>);
 [%- END %]
 
 __PACKAGE__->_factory(
@@ -18,23 +18,23 @@ __PACKAGE__->_factory(
     ) ],
     {
 [% FOREACH element = complexType.get_element -%]
-        [% element.get_name %] => \%[% element.get_name %]_of,
+        '[% element.get_name %]' => \%[% XSD.perl_name(element.get_name) %]_of,
 [% END -%]
     },
     {
 [% FOREACH element = complexType.get_element;
     IF (type = element.get_type);
-        element_type = complexType.expand( type ); -%]
+        element_type = definitions.first_types.find_type(complexType.expand( type )); -%]
-        [% element.get_name %] => '[% XSD.get_type_prefix(element_type.0) %]::[% element_type.1 %]',
+        '[% element.get_name %]' => '[% 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 %] => '[% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% complexType.get_name %]::_[% element.get_name %]',
+    '[% element.get_name %]' => '[% XSD.create_subpackage_name({ value => element }) %]',
 [%  END;
 END -%]
     }

lib/SOAP/WSDL/Generator/Template/XSD/complexType/atomicTypes.tt

@@ -1,7 +1,7 @@
 
 [% FOREACH type IN atomic_types; %]
-
+[%# TODO generate name create_name method %]
-package [% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% complexType.get_name %]::_[% type.key %];
+package [% XSD.create_subpackage_name(type); %];
 use strict;
 use warnings;
 {

lib/SOAP/WSDL/Generator/Template/XSD/complexType/attributeSet.tt

@@ -1,16 +1,15 @@
-[% IF (complexType.get_attribute.size) %]
+[% IF (complexType.get_attribute.size) -%]
-package [% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% complexType.get_name.replace('\.','::').replace('-','_') %]::_ATTR;
+package [% XSD.create_xmlattr_name(complexType) %];
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
-[%
+[% FOREACH element = complexType.get_attribute %]
-
-FOREACH element = complexType.get_attribute %]
 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 %]
         [% element.get_name -%]
 [% END %]
     ) ],
@@ -22,23 +21,24 @@ __PACKAGE__->_factory(
     {
 [% FOREACH element = complexType.get_attribute;
     IF (type = element.get_type);
-        element_type = complexType.expand( type );
+        element_type = definitions.first_types.find_type(complexType.expand( type ));
 -%]
-        [% element.get_name %] => '[% XSD.get_type_prefix(element_type.0) %]::[% element_type.1 %]',
+        [% element.get_name %] => '[% XSD.create_xsd_name(element_type) %]',
 [%
-    ELSE;
+    ELSIF (ref = element.get_ref);
-        IF (element.first_simpleType);
+            attribute = definitions.first_types.find_attribute( complexType.expand(ref) );
+            # element_type = definitions.get_types.0.find_type(complexType.expand( attribute.get_type ));
+%]
+            [% attribute.get_name %] => '[% XSD.create_xsd_name(attribute) %]',
+[%  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;
+    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 attribute ${ element.get_name } in ${ complexType.get_name } - don't know what to do with it";
-        END; %]
+    END;
-        [% element.get_name %] => '[% XSD.get_type_prefix(complexType.get_targetNamespace) %]::[% complexType.get_name %]::_[% element.get_name %]',
-[%  END;
 END -%]
     }
 );
 
 } # end BLOCK
-
 [% END %]

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');
     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 %]

lib/SOAP/WSDL/Generator/Template/XSD/complexType/extension.tt

@@ -20,7 +20,7 @@ END;
 complexType.set_element( element_list );
 
 -%]
-use base qw([% XSD.get_type_prefix(base_name.0) %]::[% base_name.1.replace('\.', '::') %]);
+use base qw([% XSD.create_xsd_name( base_type ) %]);
 [%
 
 INCLUDE complexType/variety.tt(complexType = complexType);

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([% XSD.get_type_prefix(base_name.0) %]::[% base_name.1.replace('\.', '::') %]);
+use base qw([% XSD.create_xsd_type(base_type) %]);
 [%
 ELSE;
     THROW NOT_IMPLEMENTED, "restriction without base not supported";

lib/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent.tt

@@ -1,8 +1,9 @@
 [% IF (complexType.get_variety == 'restriction');
     INCLUDE complexType/restriction.tt(complexType = complexType);
 ELSIF (complexType.get_variety == 'extension');
-    THROW NOT_IMPLEMENTED, "${ complexType.get_name } - complexType simpleContent extension not implemented yet";
+    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 }";
+    THROW UNKNOWN, "unknown variety ${ complexType.get_variety } in complexType name='${complexType.get_name}'";
 END;
 %]

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 %]

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

@@ -1,5 +1,5 @@
 [% USE XSD(context) %]
-package [% XSD.get_element_prefix(element.get_targetNamespace) %]::[% element.get_name.replace('\.','::') %];
+package [% XSD.create_xsd_name(element) %];
 use strict;
 use warnings;
 
@@ -13,17 +13,21 @@ __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 ); %]
 );
 
 }
@@ -41,16 +45,9 @@ use base qw(
     SOAP::WSDL::XSD::Typelib::Element
     SOAP::WSDL::XSD::Typelib::ComplexType
 );
+
 [% INCLUDE complexType/contentModel.tt -%]
 
-}
-
-package [% XSD.get_element_prefix(element.get_targetNamespace) %]::[% element.get_name.replace('\.','::').replace('-','_') %]::_ATTR;
-use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
-[% INCLUDE complexType/attributeSet.tt %]
-
-[% ELSE %]
-
 } # end of BLOCK
 
 [% END %]
@@ -67,18 +64,20 @@ use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 [% head1 %] NAME
 
-[% XSD.get_element_prefix(element.get_targetNamespace) %]::[% 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) %]
+
 [% head1 %] METHODS
 
 [% head2 %] new
 
- my $element = [% XSD.get_element_prefix(element.get_targetNamespace) %]::[% element.get_name %]->new($data);
+ my $element = [% XSD.create_xsd_name(element) %]->new($data);
 
 Constructor. The following data structure may be passed to new():
 

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 %]

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

@@ -1,5 +1,5 @@
 [% USE XSD(context) -%]
-package [% XSD.get_type_prefix(simpleType.get_targetNamespace) %]::[% simpleType.get_name.replace('\.','::').replace('-','_') %];
+package [% XSD.create_xsd_name(simpleType) %];
 use strict;
 use warnings;
 
@@ -21,20 +21,18 @@ __END__
 
 [% pod %]
 
-[% head1 %] [% XSD.get_type_prefix(simpleType.get_targetNamespace) %]::[% 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 POD/annotation.tt(node = simpleType) %]
-    INCLUDE simpleType/POD/list.tt;
+
-ELSIF (simpleType.get_variety == 'restriction');
+[% INCLUDE simpleType/POD/contentModel.tt(simpleType = simpleType) %]
-    INCLUDE simpleType/POD/restriction.tt;
-ELSE;
-    THROW NOT_IMPLEMENTED "simpleType union not implemented yet in $simpleType.get_name";
-END %]
 
 [% head1 %] METHODS
 

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 %]

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 );
+    type = definitions.get_types.0.find_type(simpleType.expand( name )); %]
-    IF (type_name.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
+    [% XSD.create_xsd_name(type) %]
-SOAP::WSDL::XSD::Typelib::Builtin::[% type_name.1 %]
+[% ELSE;
-[% ELSE -%]
-    [% type_prefix %]::[% type_name.1 %]
-[% END;
-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 -%].

lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/restriction.tt

@@ -1,12 +1,8 @@
 This clase is derived from [%-
 IF (name = simpleType.get_base);
-    type_name = simpleType.expand( name );
+    type = definitions.get_types.0.find_type(simpleType.expand(name)); %]
-    IF (type_name.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
+   [% XSD.create_xsd_name(type); %]
-SOAP::WSDL::XSD::Typelib::Builtin::[% type_name.1 %]
+[% ELSE;
-[% ELSE -%]
-    [% type_prefix %]::[% type_name.1 %]
-[% END;
-ELSE;
     # THROW NOT_IMPLEMENTED "atomic simpleType restriction not implemented yet in $simpleType.get_name";
     %] a atomic base type. Unfortunately there's no documenatation generation for atomic base types yet. [%
 END -%]

lib/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/union.tt

@@ -0,0 +1,8 @@
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."

lib/SOAP/WSDL/Generator/Template/XSD/simpleType/contentModel.tt

@@ -2,6 +2,8 @@
     INCLUDE simpleType/list.tt(simpleType = simpleType);
 ELSIF (simpleType.get_variety == 'restriction');
     INCLUDE simpleType/restriction.tt(type = simpleType);
+ELSIF (simpleType.get_variety == 'union');
+    INCLUDE simpleType/union.tt(type = simpleType);
 ELSE;
     THROW NOT_IMPLEMENTED "${ element.get_name } - ${ simpleType.get_variety } not supported yet";
 END %]

lib/SOAP/WSDL/Generator/Template/XSD/simpleType/list.tt

@@ -1,17 +1,13 @@
+[% USE XSD %]
 # list derivation
 use base qw(
     SOAP::WSDL::XSD::Typelib::Builtin::list
 [%
 IF (name = simpleType.get_itemType);
-    type_name = simpleType.expand( name );
+    type = definitions.get_types.0.find_type(simpleType.expand( name )); -%]
-    IF (type_name.0 == 'http://www.w3.org/2001/XMLSchema'); -%]
+    [% XSD.create_xsd_name(type) %]
-    SOAP::WSDL::XSD::Typelib::Builtin::[% type_name.1 %]
 );
-[% ELSE -%]
+[% ELSIF (type = simpleType.first_simpleType); %]
-    [% type_prefix %]::[% type_name.1 %]
-);
-[% END;
-ELSIF (type = simpleType.first_simpleType); %]
 );
 
 [% INCLUDE simpleType/atomicType.tt(type = type);

lib/SOAP/WSDL/Generator/Template/XSD/simpleType/restriction.tt

@@ -1,9 +1,14 @@
 # derivation by restriction
 [% IF (base = simpleType.get_base) -%]
 use base qw(
-    [% INCLUDE _type_class.tt(type = base, node=simpleType) %]);
+    [%
+    base_type = definitions.get_types.0.find_type(simpleType.expand(base));
+    IF ! base_type;
+        THROW NOT_FOUND "No base type in " _ simpleType.get_parent.get_name;
+    END;
+    XSD.create_xsd_name(base_type) %]);
 [% ELSIF (type = simpleType.first_simpleType() );
     INCLUDE simpleType/atomicType.tt(type = type);
 ELSE;
     THROW "neither base nor atomic type - don't know what to do" %]
-[% END %]
+[% END %]

lib/SOAP/WSDL/Generator/Template/XSD/simpleType/union.tt

@@ -0,0 +1,11 @@
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);

lib/SOAP/WSDL/Generator/Visitor.pm

@@ -77,24 +77,24 @@ Visitor:
 
     package PersonVisitor;
     use Class::Std;    # handles all basic stuff like constructors etc.
- 
+
     sub visit_Person {
         my ( $self, $object ) = @_;
         print "Person name is ", $object->get_name(), "\n";
     }
- 
+
     package Person;
     use Class::Std;
     my %name : ATTR(:name<name> :default<anonymous>);
- 
+
     sub accept { $_[1]->visit_Person( $_[0] ) }
- 
+
     package main;
     my @person_from = ();
     for (qw(Gamma Helm Johnson Vlissides)) {
         push @person_from, Person->new( { name => $_ } );
     }
- 
+
     my $visitor = PersonVisitor->new();
     for (@person_from) {
         $_->accept($visitor);
@@ -269,7 +269,7 @@ SOAP::WSDL data classes:
 In your Visitor, you must implement visit_Foo methods for all classes you wish
 to visit.
 
-Currently, all SOAP::WSDL::Generator::Visitor implementations include their own
+The SOAP::WSDL::Generator::Visitor implementations include part of their own
 Iterator (which means they know how to find the next objects to visit). You
 may or may not choose to implement a separate Iterator.
 
@@ -279,9 +279,12 @@ easy as writing something like this:
  my $visitor = MyVisitor->new();
  my $parser = SOAP::WSDL::Expat::WSDLParser->new();
  my $definitions = $parser->parse_file('my.wsdl'):
- 
+
  $definitions->_accept( $visitor );
 
+If you need an iterator following the somewhat crude path of dependencies in
+a WSDL1.1 definition, you might want to look at L<SOAP::WSDL::Generator::Iterator::WSDL11>.
+
 =head1 REFERENCES
 
 =over
@@ -296,10 +299,10 @@ Addison-Wesley Longman, Amsterdam.
 
 =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
+This file is part of SOAP-WSDL. You may distribute/modify it under the same
-the same terms as perl itself
+terms as perl itself
 
 =head1 AUTHOR
 
@@ -307,9 +310,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 239 $
+ $Rev: 391 $
  $LastChangedBy: kutterma $
- $Id: Client.pm 239 2007-09-11 09:45:42Z kutterma $
+ $Id: Client.pm 391 2007-11-17 21:56:13Z kutterma $
  $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $
 
 =cut

lib/SOAP/WSDL/Generator/Visitor/Typemap.pm

@@ -9,13 +9,11 @@ our $VERSION = q{2.00_25};
 
 my %path_of             :ATTR(:name<path>           :default<[]>);
 my %typemap_of          :ATTR(:name<typemap>        :default<()>);
-my %type_prefix_of      :ATTR(:name<type_prefix>    :default<()>);
+my %resolver_of         :ATTR(:name<resolver>       :default<()>);
-my %element_prefix_of   :ATTR(:name<element_prefix> :default<()>);
 
 sub START {
     my ($self, $ident, $arg_ref) = @_;
-    $type_prefix_of{ $ident } ||= 'MyTypes';
+    $resolver_of { $ident } = $arg_ref->{ resolver };
-    $element_prefix_of{ $ident } ||= 'MyElements';
 }
 
 sub set_typemap_entry {
@@ -41,105 +39,6 @@ sub add_element_path {
     #        . $element->get_name();
 }
 
-sub visit_Definitions {
-    my ( $self, $ident, $definitions ) = ( $_[0], ident $_[0], $_[1] );
-
-    $self->set_definitions( $definitions );
-
-    for ( @{ $definitions->get_service() } ){
-        $_->_accept($self);
-    }
-}
-
-sub visit_Service {
-    my ( $self, $service ) = ( $_[0], $_[1] );
-
-    for ( @{ $service->get_port() } ) { $_->_accept($self); }
-}
-
-sub visit_Port {
-    my ( $self, $ident, $port ) = ( $_[0], ident $_[0], $_[1] );
-
-    # This is a false assumption - typemaps may be valid for non-soap
-    # bindings as well.
-    # TODO check and correct
-    return if not $port->first_address();
-    return if not $port->first_address()->isa('SOAP::WSDL::SOAP::Address');
-
-    my $binding = $self->get_definitions()
-      ->find_binding( $port->expand( $port->get_binding() ) )
-      or die 'binding ' . $port->get_binding() . ' not found!';
-
-    $binding->_accept($self);
-}
-
-sub visit_Binding {
-    my ( $self, $ident, $binding ) = ( $_[0], ident $_[0], $_[1] );
-
-    my $portType = $self->get_definitions()
-      ->find_portType( $binding->expand( $binding->get_type ) )
-      or die 'portType not found: ' . $binding->binding_type;
-
-    for my $operation ( @{ $binding->get_operation() } ) {
-        my $name = $operation->get_name();
-
-        # get the equally named operation from the portType
-        my ($op) = grep { $_->get_name eq $name }
-            @{ $portType->get_operation() }
-            or die "operation <$name> not found";
-
-        # visit every input, output and fault message...
-        for ( @{ $op->get_input }, @{ $op->get_output }, @{ $op->get_fault } ) {
-            $_->_accept($self);
-        }
-    }
-}
-
-sub visit_OpMessage {
-    my ( $self, $ident, $operation_message ) = ( $_[0], ident $_[0], $_[1] );
-    return if not( $operation_message->get_message() );    # we're in binding
-
-    # TODO maybe allow more messages && overloading by specifying name
-
-    # find message referenced in operation
-    my $message = $self->get_definitions()->find_message(
-        $operation_message->expand( $operation_message->get_message() ) );
-
-    for my $part ( @{ $message->get_part() } ) {
-        $part->_accept($self);
-    }
-}
-
-sub visit_Part {
-    my ( $self, $ident, $part ) = ( $_[0], ident $_[0], $_[1] );
-
-    my $types_ref = $self->get_definitions()->first_types()
-      or warn "Empty part" . $part->get_name();
-
-    # resolve type
-    # 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
-    if ( my $type_name = $part->get_type ) {
-        # FIXME support RPC-style calls
-        die "unsupported global type <$type_name> found in part ". $part->get_name();
-    }
-
-    # TODO factor out iterator or replace by lookup (probably better)
-    if ( my $element_name = $part->get_element() ) {
-        my $element = $types_ref->find_element(
-          $part->expand($element_name) )
-          || die "no element $element_name found for part " . $part->get_name();
-        $element->_accept($self);
-        return;
-    }
-
-    warn 'neither type nor element - do not know what to do for part '
-          . $part->get_name();
-    return;
-}
-
 sub process_referenced_type {
     my ( $self, $ns, $localname ) = @_;
     return if not $localname;
@@ -149,18 +48,13 @@ sub process_referenced_type {
     # Caveat: visits type if it's a referenced type from the
     # a ? b : c operation.
     my ($type, $typeclass);
-    if ( $ns eq 'http://www.w3.org/2001/XMLSchema' ) {
+    $type = $self->get_definitions()->first_types()->find_type( $ns, $localname );
-        $typeclass = "SOAP::WSDL::XSD::Typelib::Builtin::$localname";
+    $typeclass = $self->get_resolver()->create_xsd_name($type);
-    }
-    else {
-        $type = $self->get_definitions()->first_types()->find_type( $ns, $localname );
-        $typeclass = join( q{::}, $type_prefix_of{$ident}, $type->get_name() );
-    }
 
     # set before to allow it to be used from inside _accept
     $self->set_typemap_entry($typeclass);
 
-    $type->_accept($self) if ($type);
+    $type->_accept($self) if ($ns ne 'http://www.w3.org/2001/XMLSchema');
 
     # set afterwards again (just to be sure...)
     $self->set_typemap_entry($typeclass);
@@ -202,17 +96,21 @@ sub visit_XSD_Element {
         if ($element->get_simpleType()) {
             # warn "simpleType " . $element->get_name();
             my @path = @{ $path_of{ ${ $self } } };
-            my $typeclass = defined ($parent)
+            my $typeclass = $self->get_resolver()->create_subpackage_name($element);
-                ? join '::_', $parent , $element->get_name()
+#            my $typeclass = defined ($parent)
-                : join q{::}, $element_prefix_of{$ident}, $element->get_name();
+#                ? join q{::_}, $parent , $element->get_name()
+#                : join q{::}, $self->resolver()->get_element_prefix( $element->get_targetNamespace), $element->get_name();
             $self->set_typemap_entry($typeclass);
+            $typeclass =~s{\.}{::}g;
+            $typeclass =~s{\-}{_}g;
             last SWITCH;
         }
 
         # for atomic and complex types , and ref elements
-        my $typeclass = join q{::}, $element_prefix_of{$ident}, $element->get_name();
+        my $typeclass = $self->get_resolver()->create_subpackage_name($element);
-        $typeclass =~s{\.}{::}g;
+#        my $typeclass = join q{::}, $self->get_resolver()->get_element_prefix( $element->get_targetNamespace), $element->get_name();
-        $typeclass =~s{\-}{_}g;
+#        $typeclass =~s{\.}{::}g;
+#        $typeclass =~s{\-}{_}g;
         $self->set_typemap_entry($typeclass);
 
         $self->process_atomic_type( $element->first_complexType()
@@ -226,9 +124,10 @@ sub visit_XSD_Element {
     # a normal (not atomic) type, we just override it here
     if (not defined($parent)) {
         # for atomic and complex types , and ref elements
-        my $typeclass = join q{::}, $element_prefix_of{$ident}, $element->get_name();
+        my $typeclass = $self->get_resolver()->create_xsd_name($element);
-        $typeclass =~s{\.}{::}g;
+#        my $typeclass = join q{::}, $self->get_resolver()->get_element_prefix($element->get_targetNamespace), $element->get_name();
-        $typeclass =~s{\-}{_}g;
+#        $typeclass =~s{\.}{::}g;
+#        $typeclass =~s{\-}{_}g;
         $self->set_typemap_entry($typeclass);
     }
 
@@ -238,11 +137,12 @@ sub visit_XSD_Element {
 
 sub visit_XSD_ComplexType {
     my ($self, $ident, $type) = ($_[0], ident $_[0], $_[1] );
-    my $content_model = $type->get_flavor();
+    my $variety = $type->get_variety();
-    # TODO is this allowed ? or should we better die ?
+    my $content_model = $type->get_contentModel;
-    return if not $content_model; # empty complexType
+    return if not $variety; # empty complexType
+    return if ($content_model eq 'simpleContent');
 
-    if ( grep { $_ eq $content_model} qw(all sequence choice) )
+    if ( grep { $_ eq $variety} qw(all sequence choice) )
     {
         # visit child elements
         for (@{ $type->get_element() || [] }) {
@@ -251,7 +151,21 @@ sub visit_XSD_ComplexType {
         return;
     }
 
-    warn "unsupported content model $content_model found in "
+    if (grep { $_ eq $variety } qw(restriction extension) ) {
+        # resolve base / get atomic type and run on elements
+        if (my $type_name = $type->get_base()) {
+            my $subtype = $self->get_definitions()
+                ->first_types()->find_type( $type->expand($type_name) );
+            # visit child elements
+            for (@{ $subtype->get_element() || [] }) {
+                $_->_accept( $self );
+            }
+            # that's all for restriction
+            return if ($variety eq 'restriction');
+        }
+    }
+
+    warn "unsupported content model $variety found in "
         . "complex type " . $type->get_name()
         . " - typemap may be incomplete";
 }

lib/SOAP/WSDL/Manual.pod

@@ -22,15 +22,15 @@ service).
 
 =item * Write script
 
- use MyInterface::SERVICE_NAME::PORT_NAME;
+ use MyInterfaces::SERVICE_NAME::PORT_NAME;
- my $service = MyInterface::SERVICE_NAME::PORT_NAME->new();
+ my $service = MyInterfaces::SERVICE_NAME::PORT_NAME->new();
- 
+
  my $result = $service->SERVICE_METHOD();
  die $result if not $result;
- 
+
  print $result;
 
-C<perldoc MyInterface::SERVICE_NAME::PORT_NAME> should give you some overview
+C<perldoc MyInterfaces::SERVICE_NAME::PORT_NAME> should give you some overview
 about the service's interface structure.
 
 The results of all calls to your service object's methods (except new) are
@@ -103,9 +103,9 @@ included perldoc will be, too - if not, blame the web service author.
 
 =item * Write a perl script (or module) accessing the web service.
 
- use MyInterface::SERVICE_NAME;
+ use MyInterfaces::SERVICE_NAME::PORT_NAME;
- my $service = MyInterface::SERVICE_NAME->new();
+ my $service = MyInterfaces::SERVICE_NAME::PORT_NAME->new();
- 
+
  my $result = $service->SERVICE_METHOD();
  die $result if not $result;
  print $result;
@@ -264,7 +264,7 @@ method called "get_basic_credentials" to SOAP::WSDL::Transport::HTTP:
 When using SOAP::Transport::HTTP (SOAP::Lite is installed), do the same to
 this backend:
 
- *SOAP::Transport::HTTP::get_basic_credentials = sub {
+ *SOAP::Transport::HTTP::Client::get_basic_credentials = sub {
      return ($user, $password);
  };
 

lib/SOAP/WSDL/Manual/WS_I.pod

@@ -430,7 +430,7 @@ TODO support rpc-literal bindings.
 The wsdl:import element imports the referenced WSDL definition.
 
 This is rather hard-wired and does not allow to specify a wsdl:import without
-a resolvable location.
+a resolvable location in SOAP::WSDL.
 
 =head2 R4002
 
@@ -681,7 +681,7 @@ is Schema valid.
  WSDL description.
 
 SOAP::WSDL (partially) supports the wsdl:import statement. The wsdl:include
-statement is not supported (yet).
+statement is not supported.
 
 It's the responsibility of the WSDL author to use only the wsdl:import
 statement for importing WSDL descriptions.
@@ -1252,9 +1252,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 514 $
+ $Rev: 562 $
  $LastChangedBy: kutterma $
- $Id: WS_I.pod 514 2008-01-31 19:57:52Z kutterma $
+ $Id: WS_I.pod 562 2008-02-22 20:32:17Z kutterma $
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Manual/WS_I.pod $
 
 =cut

lib/SOAP/WSDL/Manual/XSD.pod

@@ -305,18 +305,17 @@ XML Schema facets are not implemented yet.
 They will probably implemented some day by putting constant methods into
 the correspondent classes.
 
-=head1 ATTRIBUTES
+=head2 Attributes
-
-XML attributes are not implemented yet. The documentation below sketches
-how XML attributes will be implemented in the future.
-
-All XML attributes are derived from SOAP::WSDL::XSD::Typelib::Attribute.
 
 The attribute set for a XML element (derived from anySimpleType or
 complexType) is implemented as a sub-package of the element derived from
 SOAP::WSDL::XSD::Typelib::AttributeSet.
 
-The sub-package is named as the top package, suffixed with C<_ATTR>.
+The sub-package is named as the corresponding type or element package,
+suffixed with C<XmlAttr>. The suffix "XmlAttr" has carefully been chosen to
+avoid potential naming clashes: The name XmlAttr cannot be included as
+element or type name in XML schemas - the XML standard bans the use of names
+starting with "xml" (case-insensitive).
 
 All XML attributes for a XML element are set- and retrievable via the method
 C<attr>. The name is chosen to allow mimicing SOAP::Lite's behaviour, which
@@ -336,6 +335,28 @@ get_FOO methods.
 The C<attr> method provides auto-vivification: An xml object's attribute set
 is instantiated when accessed.
 
+Auto-vivification is only triggered if there actually B<is> a set of
+attributes for the class/object in question, so you may want to test
+whether the result of ->attr is defined:
+
+ my $attr = $unknownObject->attr();
+ if (defined($attr)) {
+     $unknownObject->attr({
+         some => 'value',
+     });
+ }
+
+=head2 group
+
+CAVEAT: Group resolution is not implemented yet.
+
+XML Schema Group definitions are just treated as aliases that can be
+inserted in complexType definitions by referencing them. That is, there's
+no difference between a complexType with simpleContent and a sequence of
+three elements, and a complexType with simpleContent referencing a group
+containing the same sequence of elements.
+
+
 =head1 CAVEATS
 
 =over
@@ -364,70 +385,153 @@ The constructors of all SOAP::WSDL::XSD::Typelib:: classes don't !
 
 The following XML Schema declaration elements are not supported yet:
 
+=head2 XML Schema elements partially supported
+
+=head3 Type definition elements
+
 =over
 
-=item * Declaration elements
+=item * simpleContent
 
- attribute
+simpleContent is only supported with a restriction or extension with a C<base>
- notation
+attribute. simpleContent declarations deriving from a atomic type are not
-
+supported (yet).
-=item * Type definition elements
-
- simpleContent
- union
-
-=item * Content model definition elements
-
- any
- anyAttribute
- attributeGroup
- group
-
-=item * Identity definition elements
-
- field
- key
- keyref
- selector
- unique
-
-=item * Inclusion elements
-
- import
- include
- redefine
 
 =back
 
-The following XML Schema declaration elements are supported, but have no
+=head3 Inclusion elements
-effect yet:
 
 =over
 
-=item * Factes
+=item * import
 
- enumeration
+The import includion element requires the schemaLocation attribute for
- fractionDigits
+resolving the XML schema to import. Support for the import element is
- lenght
+implemented in L<SOAP::WSDL::Expat::WSDLParser|SOAP::WSDL::Expat::WSDLParser>,
- maxExclusive
+so alternative parsers may or may not support the import element.
- maxInclusiove
- maxLength
- minExclusive
- minInclusive
- minLength
- pattern
- totalDigits
- whitespace
 
-=item * Documentation elements
+L<SOAP::WSDL::Expat::WSDLParser|SOAP::WSDL::Expat::WSDLParser> keeps track of
+included schemas and prevents import loops.
 
- appinfo
+=back
+
+=head3 Facets
+
+The following XML Schema declaration elements are supported, but have no
+effect yet.
+
+=over
+
+=item * enumeration
+
+=item * fractionDigits
+
+=item * lenght
+
+=item * maxExclusive
+
+=item * maxInclusiove
+
+=item * maxLength
+
+=item * minExclusive
+
+=item * minInclusive
+
+=item * minLength
+
+=item * pattern
+
+=item * totalDigits
+
+=item * whitespace
+
+=back
+
+
+=head2 XML Schema elements not implemented
+
+=head3 Declaration elements
+
+=over
+
+=item * notation
+
+=back
+
+=head3 Content model definition elements
+
+=over
+
+=item * any
+
+The horror of each XML schema implementation: Just anything...
+
+C<any> declarations are not supported yet.
+
+=item * anyAttribute
+
+=item * attributeGroup
+
+C<attributeGroup> declarations actually just are macros for XML Schema
+writers: Including an attributeGroup in a declaration has the same effect
+as including all attributes in the group.
+
+Just not implemented yet.
+
+=item * group
+
+The group definition element is not supported yet.
+
+=back
+
+=head3 Identity definition elements
+
+These declaration elements don't declare XML elements, but apply identity
+constraints. They have no effect yet.
+
+=over
+
+=item * field
+
+=item * key
+
+=item * keyref
+
+=item * selector
+
+=item * unique
+
+=back
+
+=head3 Inclusion elements
+
+=over
+
+=item * include
+
+Use of the include inclusion element is forbidden by the WS-I basic profile.
+It is not supported (yet).
+
+=item * redefine
+
+Not supported (yet).
+
+=back
+
+=head3 * Documentation elements
+
+=over
+
+=item * appinfo
+
+The appinfo documentation element is ignored.
 
 =back
 
 =head1 LICENSE
 
-Copyright 2007 Martin Kutter.
+Copyright 2007,2008 Martin Kutter.
 
 This file is part of SOAP-WSDL. You may distribute/modify it under
 the same terms as perl itself

lib/SOAP/WSDL/OpMessage.pm

@@ -4,9 +4,9 @@ use warnings;
 use Class::Std::Fast::Storable;
 use base qw(SOAP::WSDL::Base);
 
-my %body_of         :ATTR(:name<body> :default<[]>);
+my %body_of         :ATTR(:name<body>           :default<[]>);
-my %header_of       :ATTR(:name<header> :default<[]>);
+my %header_of       :ATTR(:name<header>         :default<[]>);
-my %headerfault_of  :ATTR(:name<headerfault> :default<[]>);
+my %headerfault_of  :ATTR(:name<headerfault>    :default<[]>);
-my %message_of      :ATTR(:name<message> :default<()>);
+my %message_of      :ATTR(:name<message>        :default<()>);
 
 1;

lib/SOAP/WSDL/Server.pm

@@ -162,7 +162,7 @@ hash keys.
 
 =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

lib/SOAP/WSDL/Server/CGI.pm

@@ -12,7 +12,7 @@ use Class::Std::Fast::Storable;
 
 use base qw(SOAP::WSDL::Server);
 
-our $VERSION=q{2.00_27};
+our $VERSION=q{2.00_33};
 
 # mostly copied from SOAP::Lite. Unfortunately we can't use SOAP::Lite's CGI
 # server directly - we would have to swap out it's base class...
@@ -38,6 +38,8 @@ sub handle {
 
     my $content = q{};
     my $buffer;
+
+    # do wen need to use bytes; here ?
     binmode(STDIN);
     while (read(STDIN,$buffer,$length - length($content))) {
         $content .= $buffer;
@@ -113,11 +115,64 @@ SOAP::WSDL::Server::CGI - CGI based SOAP server
 
 =head1 SYNOPSIS
 
+ use MyServer::TestService::TestPort;
+ my $server = MyServer::TestService::TestPort->new({
+    dispatch_to => 'main',
+    transport_class => 'SOAP::WSDL::Server::CGI',   # optional, default
+ });
+ $server->handle();
+
+=head1 USAGE
+
+To use SOAP::WSDL::Server::CGI efficiently, you should first create a server
+interface using L<wsdl2perl.pl|wsdl2perl.pl>.
+
+SOAP::WSDL::Server dispatches all calls to appropriately named methods in the
+class or object set via C<dispatch_to>.
+
+See the generated server class on details.
+
 =head1 DESCRIPTION
 
+Lightweight CGI based SOAP server. SOAP::WSDL::Server::CGI does not provide
+the fancier things of CGI handling, like URL parsing, parameter extraction
+or the like, but provides a basic SOAP server using SOAP::WSDL::Server.
+
+=head1 METHODS
+
+=head1 EXCEPTION HANDLING
+
+SOAP::WSDL::CGI handles the following errors:
+
+=over
+
+=item * XML parsing error
+
+=back
+
+The proper way to throw a exception is just to die -
+SOAP::WSDL::Server::CGI catches the exception and sends a SOAP Fault
+back to the client.
+
+If you want more control over the SOAP Fault sent to the client, you can
+die with a SOAP::WSDL::SOAP::Fault11 object - or just let the
+SOAP::Server's deserializer create one for you:
+
+ my $soap = MyServer::SomeService->new();
+
+ die $soap->get_deserializer()->generate_fault({
+    code => 'soap:Server',
+    role => 'urn:localhost',
+    message => "The error message to pas back",
+    detail => "Some details on the error",
+ });
+
+You may use any other object as exception, provided it has a
+serialize() method which returns the object's XML representation.
+
 =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

lib/SOAP/WSDL/Service.pm

@@ -4,6 +4,6 @@ use warnings;
 use Class::Std::Fast::Storable;
 use base qw(SOAP::WSDL::Base);
 
-my %port_of    :ATTR(:name<port>   :default<()>);
+my %port_of    :ATTR(:name<port>   :default<[]>);
 
 1;

lib/SOAP/WSDL/TypeLookup.pm

@@ -4,7 +4,7 @@ use warnings;
 
 our $VERSION=q{2.00_31};
 
-my %TYPES = (
+my %TYPE_FROM = (
     # wsdl:
     'http://schemas.xmlsoap.org/wsdl/' => {
         'import' => {
@@ -97,10 +97,11 @@ my %TYPES = (
         },
         attribute => {
             type => 'CLASS',
-            class => 'SOAP::WSDL::XSD::Attribute'      # not implemented yet
+            class => 'SOAP::WSDL::XSD::Attribute',
         },
-        attributeGroup => {
+        attributeGroup  => {
-            type => 'SKIP',     # not implemented yet
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::AttributeGroup',
         },
         key => {
             type => 'SKIP',     # not implemented yet
@@ -115,7 +116,12 @@ my %TYPES = (
             type => 'SKIP',     # not implemented yet
         },
         annotation => {
-            type => 'SKIP',     # not implemented yet
+            type => 'CLASS',     # not implemented yet
+            class => 'SOAP::WSDL::XSD::Annotation',
+        },
+        documentation => {
+            type => 'CONTENT',
+            method => 'set_documentation',
         },
         appinfo => {
             type => 'SKIP',     # not implemented yet
@@ -162,13 +168,12 @@ my %TYPES = (
             method => 'set_union',
         },
         enumeration => {
-            type => 'SKIP',
+            type => 'CLASS',
-            # method => 'push_enumeration',
+            class => 'SOAP::WSDL::XSD::Enumeration',
         },
         group => {
-            type => 'METHOD',
+            type => 'CLASS',
-            method => 'set_variety',
+            class => 'SOAP::WSDL::XSD::Group',
-            value => 'group',
         },
         all => {
             type => 'METHOD',
@@ -185,14 +190,51 @@ my %TYPES = (
             method => 'set_variety',
             value => 'sequence',
         },
+        value => {
+            type => 'SKIP',
+        },
+        minExclusive => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::MinExclusive',
+        },
+        maxExclusive => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::MaxExclusive',
+        },
+        minInclusive => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::MinInclusive',
+        },
+        maxInclusive => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::MaxInclusive',
+        },
+        maxLength => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::MaxLength',
+        },
+        minLength => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::MinLength',
+        },
+        totalDigits => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::TotalDigits',
+        },
+        fractionDigits => {
+            type => 'CLASS',
+            class => 'SOAP::WSDL::XSD::FractionDigits',
+        },
     },
 );
 
+$TYPE_FROM{ 'http://www.w3.org/2000/10/XMLSchema' } = $TYPE_FROM{ 'http://www.w3.org/2001/XMLSchema' };
+
 sub lookup {
     my $self = shift;
     my $namespace = shift  || 'http://schemas.xmlsoap.org/wsdl/';
     my $name = shift;
-    return $TYPES{ $namespace }->{ $name };
+    return $TYPE_FROM{ $namespace }->{ $name };
 }
 
 1;

lib/SOAP/WSDL/Types.pm

@@ -23,6 +23,16 @@ sub find_type {
     return;
 }
 
+sub find_attribute {
+    my ($self, $ns, $name) = @_;
+    ($ns, $name) = @{ $ns } if ref $ns;     # allow passing list refs
+    foreach my $schema (@{ $schema_of{ ident $self } }) {
+        my $type = $schema->find_attribute($ns, $name);
+        return $type if $type;
+    }
+    return;
+}
+
 sub find_element {
     my ($self, $ns, $name) = @_;
     ($ns, $name) = @{ $ns } if ref $ns;     # allow passing list refs

lib/SOAP/WSDL/XSD/Annotation.pm

@@ -0,0 +1,20 @@
+package SOAP::WSDL::XSD::Annotation;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<enumeration value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %appinfo_of        :ATTR(:name<appinfo> :default<()>);
+
+# documentation provided by Base
+
+1;

lib/SOAP/WSDL/XSD/Attribute.pm

@@ -19,14 +19,17 @@ our $VERSION=q{2.00_29};
 #  Content: (annotation?, (simpleType?))
 #</attribute>
 
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
 
 my %default_of      :ATTR(:name<default>    :default<()>);
 my %fixed_of        :ATTR(:name<fixed>      :default<()>);
-my %form_of         :ATTR(:name<form>      :default<()>);
+my %form_of         :ATTR(:name<form>       :default<()>);
-# id provided by Base
+
-# name provided by Base
 my %type_of         :ATTR(:name<type>       :default<()>);
-my %use_of          :ATTR(:name<use>      :default<()>);
+my %use_of          :ATTR(:name<use>        :default<()>);
+my %ref_of          :ATTR(:name<ref>        :default<()>);
 
 # may be defined as atomic simpleType
 my %simpleType_of   :ATTR(:name<simpleType> :default<()>);

lib/SOAP/WSDL/XSD/AttributeGroup.pm

@@ -0,0 +1,27 @@
+package SOAP::WSDL::XSD::AttributeGroup;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_29};
+
+#<attributeGroup
+#  id = ID
+#  name = NCName
+#  ref = QName
+#  {any attributes with non-schema namespace . . .}>
+#  Content: (annotation?, ((attribute | attributeGroup)*, anyAttribute?))
+#</attributeGroup>
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+my %ref_of          :ATTR(:name<ref>        :default<()>);
+
+# may be defined as atomic simpleType
+my %attribute_of        :ATTR(:name<attribute> :default<()>);
+my %attributeGroup_of   :ATTR(:name<attributeGroup> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/ComplexType.pm

@@ -6,16 +6,28 @@ use Class::Std::Fast::Storable;
 use Scalar::Util qw(blessed);
 use base qw/SOAP::WSDL::Base/;
 
-our $VERSION=q{2.00_29};
+our $VERSION=q{2.00_33};
+
+my %length_of           :ATTR(:name<length>         :default<[]>);
+my %minLength_of        :ATTR(:name<minLength>      :default<[]>);
+my %maxLength_of        :ATTR(:name<maxLength>      :default<[]>);
+my %pattern_of          :ATTR(:name<pattern>        :default<[]>);
+my %enumeration_of      :ATTR(:name<enumeration>    :default<[]>);
+my %whiteSpace_of       :ATTR(:name<whiteSpace>     :default<[]>);
+my %totalDigits_of      :ATTR(:name<totalDigits>    :default<[]>);
+my %fractionDigits_of   :ATTR(:name<fractionDigits>    :default<[]>);
+my %minExclusive        :ATTR(:name<minExclusive>   :default<[]>);
+my %minInclusive        :ATTR(:name<minInclusive>   :default<[]>);
+my %maxExclusive        :ATTR(:name<maxExclusive>   :default<[]>);
+my %maxInclusive        :ATTR(:name<maxInclusive>   :default<[]>);
 
 my %annotation_of   :ATTR(:name<annotation> :default<()>);
 my %attribute_of    :ATTR(:name<attribute>  :default<()>);
 my %element_of      :ATTR(:name<element>    :default<()>);
-#my %flavor_of       :ATTR(:name<flavor>     :default<()>);
+my %group_of        :ATTR(:name<group>      :default<()>);
 my %variety_of      :ATTR(:name<variety>    :default<()>);
 my %base_of         :ATTR(:name<base>       :default<()>);
 my %itemType_of     :ATTR(:name<itemType>   :default<()>);
-my %enumeration_of  :ATTR(:name<enumeration>   :default<()>);
 my %abstract_of     :ATTR(:name<abstract>   :default<()>);
 my %mixed_of        :ATTR(:name<mixed>      :default<()>);      # default is false
 

lib/SOAP/WSDL/XSD/Enumeration.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::Enumeration;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<enumeration value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/FractionDigits.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::Pattern;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<pattern value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/Group.pm

@@ -0,0 +1,38 @@
+package SOAP::WSDL::XSD::Group;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<xs:group name="myModelGroup">
+# <xs:sequence>
+#  <xs:element ref="someThing"/>
+#  . . .
+# </xs:sequence>
+#</xs:group>
+#
+#<xs:complexType name="trivial">
+# <xs:group ref="myModelGroup"/>
+# <xs:attribute .../>
+#</xs:complexType>
+#
+#<xs:complexType name="moreSo">
+# <xs:choice>
+#  <xs:element ref="anotherThing"/>
+#  <xs:group ref="myModelGroup"/>
+# </xs:choice>
+# <xs:attribute .../>
+#</xs:complexType>
+
+my %ref_of          :ATTR(:name<ref>      :default<()>);
+
+my %maxOccurs_of    :ATTR(:name<maxOccurs>  :default<()>);
+my %minOccurs_of    :ATTR(:name<minOccurs>  :default<()>);
+my %annotation_of   :ATTR(:name<annotation> :default<()>);
+my %element_of      :ATTR(:name<element>    :default<()>);
+my %group_of        :ATTR(:name<group>      :default<()>);
+my %variety_of      :ATTR(:name<variety>    :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/Length.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::Length;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<minExclusive value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/MaxExclusive.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::MaxExclusive;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<minExclusive value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/MaxInclusive.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::MaxInclusive;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<minExclusive value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/MaxLength.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::MaxLength;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<maxLength value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/MinExclusive.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::MinExclusive;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<minExclusive value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/MinInclusive.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::MinInclusive;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<minExclusive value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/MinLength.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::MinLength;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<minExclusive value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/Pattern.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::Pattern;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<pattern value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

lib/SOAP/WSDL/XSD/Schema.pm

@@ -4,19 +4,21 @@ use warnings;
 use Class::Std::Fast::Storable;
 use base qw(SOAP::WSDL::Base);
 
-our $VERSION=q{2.00_25};
+our $VERSION=q{2.00_33};
 
 # child elements
-my %type_of :ATTR(:name<type> :default<[]>);
+my %attributeGroup_of   :ATTR(:name<attributeGroup>  :default<[]>);
-my %element_of :ATTR(:name<element> :default<[]>);
+my %attribute_of        :ATTR(:name<attribute>       :default<[]>);
-my %group_of :ATTR(:name<group> :default<[]>);
+my %element_of          :ATTR(:name<element>         :default<[]>);
+my %group_of            :ATTR(:name<group>           :default<[]>);
+my %type_of             :ATTR(:name<type>            :default<[]>);
 
 # attributes
 my %attributeFormDefault_of :ATTR(:name<attributeFormDefault> :default<()>);
-my %blockDefault_of :ATTR(:name<blockDefault> :default<()>);
+my %blockDefault_of         :ATTR(:name<blockDefault>         :default<()>);
-my %elementFormDefault_of :ATTR(:name<elementFormDefault> :default<()>);
+my %elementFormDefault_of   :ATTR(:name<elementFormDefault>   :default<()>);
-my %finalDefault_of :ATTR(:name<finalDefault> :default<()>);
+my %finalDefault_of         :ATTR(:name<finalDefault>         :default<()>);
-my %version_of :ATTR(:name<version> :default<()>);
+my %version_of              :ATTR(:name<version>              :default<()>);
 
 # id
 # name

lib/SOAP/WSDL/XSD/Schema/Builtin.pm

@@ -8,40 +8,48 @@ use base qw(SOAP::WSDL::XSD::Schema);
 
 # all builtin types - add validation (e.g. content restrictions) later...
 my %BUILTINS = (
-    'string' => {},
+    'anyURI'            => {},
-    'boolean' => {},
+    'boolean'           => {},
-    'decimal' => {},
+    'base64Binary'      => {},
-    'dateTime' => {},
+    'byte'              => {},
-    'float' => {},
+    'date'              => {},
-    'double' => {},
+    'dateTime'          => {},
-    'duration' => {},
+    'decimal'           => {},
-    'time' => {},
+    'double'            => {},
-    'date' => {},
+    'duration'          => {},
-    'gYearMonth' => {},
+    'ENTITY'            => {},
-    'gYear' => {},
+    'float'             => {},
-    'gMonthDay' => {},
+    'gDay'              => {},
-    'gDay' => {},
+    'gMonth'            => {},
-    'gMonth' => {},
+    'gMonthDay'         => {},
-    'hexBinary' => {},
+    'gYearMonth'        => {},
-    'base64Binary' => {},
+    'gYear'             => {},
-    'anyURI' => {},
+    'hexBinary'         => {},
-    'QName' => {},
+    'ID'                => {},
-    'NOTATION' => {},
+    'IDREF'             => {},
-    'integer' => {},
+    'IDREFS'            => {},
+    'int'               => {},
+    'integer'           => {},
+    'language'          => {},
+    'long'              => {},
+    'negativeInteger'   => {},
     'nonPositiveInteger' => {},
     'nonNegativeInteger' => {},
-    'positiveInteger' => {},
+    'normalizedString'  => {},
-    'negativeInteger' => {},
+    'Name'              => {},
-    'long' => {},
+    'NCName'            => {},
-    'int' => {},
+    'NMTOKEN'           => {},
-    'unsignedInt' => {},
+    'NOTATION'          => {},
-    'short' => {},
+    'positiveInteger'   => {},
-    'unsignedShort' => {},
+    'QName'             => {},
-    'byte' => {},
+    'short'             => {},
-    'unsignedByte' => {},
+    'string'            => {},
-    'normalizedString' => {},
+    'time'              => {},
-    'token' => {},
+    'token'             => {},
-    'NMTOKEN' => {},
+    'unsignedByte'      => {},
+    'unsignedInt'       => {},
+    'unsignedLong'      => {},
+    'unsignedShort'     => {},
 );
 
 sub START {
@@ -88,10 +96,10 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 412 $
+ $Rev: 583 $
  $LastChangedBy: kutterma $
- $Id: Builtin.pm 412 2007-11-27 22:57:52Z kutterma $
+ $Id: Builtin.pm 583 2008-03-24 07:44:06Z kutterma $
  $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/XSD/Schema/Builtin.pm $
- 
+
 =cut
 

lib/SOAP/WSDL/XSD/SimpleType.pm

@@ -6,13 +6,27 @@ use base qw(SOAP::WSDL::Base);
 
 our $VERSION=q{2.00_25};
 
-my %annotation_of   :ATTR(:name<annotation>     :default<()>);
+my %length_of           :ATTR(:name<length>         :default<[]>);
-my %base_of         :ATTR(:name<base>           :default<()>);
+my %minLength_of        :ATTR(:name<minLength>      :default<[]>);
-my %itemType_of     :ATTR(:name<itemType>       :default<()>);
+my %maxLength_of        :ATTR(:name<maxLength>      :default<[]>);
-# is set to simpleContent/complexContent
+my %pattern_of          :ATTR(:name<pattern>        :default<[]>);
-# my %content_model_of    :ATTR(:name<contentModel>   :default<()>);
+my %enumeration_of      :ATTR(:name<enumeration>    :default<[]>);
+my %whiteSpace_of       :ATTR(:name<whiteSpace>     :default<[]>);
+my %totalDigits_of      :ATTR(:name<totalDigits>    :default<[]>);
+my %fractionDigits_of   :ATTR(:name<fractionDigits>    :default<[]>);
+my %minExclusive        :ATTR(:name<minExclusive>   :default<[]>);
+my %minInclusive        :ATTR(:name<minInclusive>   :default<[]>);
+my %maxExclusive        :ATTR(:name<maxExclusive>   :default<[]>);
+my %maxInclusive        :ATTR(:name<maxInclusive>   :default<[]>);
 
-# TODO rename flavor to content_model to be consistent with the XML Schema
+my %fixed               :ATTR(:name<fixed>          :default<[]>);
+
+my %annotation_of       :ATTR(:name<annotation>     :default<()>);
+my %base_of             :ATTR(:name<base>           :default<()>);
+my %itemType_of         :ATTR(:name<itemType>       :default<()>);
+
+
+# TODO rename flavor to variety to be consistent with the XML Schema
 # specs - though flavor is the cooler name..
 # set to restriction|list|union|enumeration
 my %flavor_of       :ATTR(:name<flavor>         :default<()>);
@@ -29,6 +43,7 @@ sub set_restriction {
     my $self = shift;
     my @attributes = @_;
     $self->set_flavor( 'restriction' );
+
     for (@attributes) {
         next if (not $_->{ LocalName } eq 'base');
         $self->set_base( $_->{ Value } );

lib/SOAP/WSDL/XSD/TotalDigits.pm

@@ -0,0 +1,18 @@
+package SOAP::WSDL::XSD::TotalDigits;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::Base);
+
+our $VERSION=q{2.00_33};
+
+#<totalDigits value="">
+
+# id provided by Base
+# name provided by Base
+# annotation provided by Base
+
+# may be defined as atomic simpleType
+my %value_of        :ATTR(:name<value> :default<()>);
+
+1;

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

@@ -8,8 +8,8 @@ our $VERSION=q{2.00_29};
 
 sub start_tag {
     # my ($self, $opt, $value) = @_;
-    return q{} if (@_ < 3); 
+    return q{} if (@_ < 3);
-    return qq{ $_[1]->{ name }="}
+    return qq{ $_[1]->{ name }="};
 }
 
 sub end_tag {

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

@@ -7,8 +7,7 @@ our $VERSION=q{2.00_29};
 
 sub serialize {
     # we work on @_ for performance.
-    $_[1] ||= {};                                   # $option_ref
+    # $_[1] ||= {};                                   # $option_ref
-
     return ${ $_[0]->_serialize({ attr => 1 }) };
 }