diff --git a/Build.PL b/Build.PL index 1dd37f5..b75856a 100644 --- a/Build.PL +++ b/Build.PL @@ -1,55 +1,53 @@ use Module::Build; - +use version; $build = Module::Build->new( - dist_author => 'Martin Kutter ', - create_makefile_pl => 'passthrough', - dist_abstract => 'SOAP with WSDL support', - dist_name => 'SOAP-WSDL', - dist_version => '2.00_24', - module_name => 'SOAP::WSDL', - license => 'artistic', - requires => { + dist_author => 'Martin Kutter ', + create_makefile_pl => 'passthrough', + dist_abstract => 'SOAP with WSDL support', + dist_name => 'SOAP-WSDL', + dist_version => '2.00_25', + module_name => 'SOAP::WSDL', + license => 'artistic', + requires => { # 5.6.x is way too buggy and has no unicode support # for us. SOAP-WSDL relies on unicode (WS-I demands it) # and triggers several 5.6 bugs... - 'perl' => '5.8.0', - 'Class::Std' => q/v0.0.8/, - 'Class::Std::Storable' => 0, + 'perl' => q(5.8.0), + 'Class::Std::Fast' => qv(0.0.5), 'Data::Dumper' => 0, - 'Date::Parse' => 0, - 'Date::Format' => 0, - 'File::Basename' => 0, - 'File::Path' => 0, - 'Getopt::Long' => 0, - 'List::Util' => 0, - 'LWP::UserAgent' => 0, - 'Template' => 0, - 'Term::ReadKey' => 0, - 'XML::Parser::Expat' => 0, - }, - buildrequires => { - 'Class::Std' => q/v0.0.8/, - 'Class::Std::Storable' => 0, - 'Cwd' => 0, - 'Date::Parse' => 0, - 'Date::Format' => 0, - 'Getopt::Long' => 0, - 'List::Util' => 0, - 'LWP::UserAgent' => 0, - 'File::Basename' => 0, - 'File::Path' => 0, + 'Date::Parse' => 0, + 'Date::Format' => 0, + 'File::Basename' => 0, + 'File::Path' => 0, + 'Getopt::Long' => 0, + 'List::Util' => 0, + 'LWP::UserAgent' => 0, + 'Template' => 0, + 'Term::ReadKey' => 0, + 'XML::Parser::Expat' => 0, + }, + buildrequires => { + 'Class::Std::Fast' => qv(0.0.5), + 'Cwd' => 0, + 'Date::Parse' => 0, + 'Date::Format' => 0, + 'Getopt::Long' => 0, + 'List::Util' => 0, + 'LWP::UserAgent' => 0, + 'File::Basename' => 0, + 'File::Path' => 0, 'File::Spec' => 0, - 'Storable' => 0, - 'Test::More' => 0, - 'Template' => 0, - 'XML::Parser::Expat' => 0, - }, - recursive_test_files => 1, - meta_add => { - no_index => { - directory => 'lib/SOAP/WSDL/Generator/Template/XSD/', - }, - } + 'Storable' => 0, + 'Test::More' => 0, + 'Template' => 0, + 'XML::Parser::Expat' => 0, + }, + recursive_test_files => 1, + meta_add => { + no_index => { + directory => 'lib/SOAP/WSDL/Generator/Template/XSD/', + }, + } ); $build->add_build_element('tt'); $build->create_build_script; diff --git a/Changes b/Changes index d5f55e3..931990e 100644 --- a/Changes +++ b/Changes @@ -34,6 +34,53 @@ Features: The following changes have been made: +2.00_25 +--- +WARNING: INCOMPATIBLE CHANGE: + + SOAP::WSDL now uses Class::Std::Fast. Read the MIGRATING guide for + upgrading from previous versions. + You probably need to re-generate all your interfaces. + +WARNING: INCOMPATIBLE CHANGE: + + SOAP::WSDL::XSD::Typelib::anySimpleType based objects no longer serialize + to their XML value on stringification. + This means that strings are no longer XML-escaped when the simpleType + containing the string is printed or used like this: + + my $value = "$simpleType"; + + Note that ComplexType objects still serialize to their XML on + stringification. This Change is due to the demands of applications + embedding SOAP::WSDL::XSD::Typelib objects in templates - it would mean + a nasty ->get_value for every (simple) value. + +The following features were added (the numbers in square brackets are the +tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660924): + + * [ 1837347 ] Use Class::Std::Fast + Class::Std::Fast allows optimizations which almost double SOAP::WSDL's + performance and reduce code size. Class::Std::Fast also opens the door + for even faster XS implementations. + * [ 1842436 ] Add SOAP Server + +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/). + + * [ 1842418 ] Message parser eats up whitespaces between entities + * [ 1839820 ] encoding parameter of Content-Type header set incorrectly + * [ 1839851 ] token in UPPERCASE in default typemap + * [ 1839690 ] Can't use two prefixes for namespace in WSDL + * [ 1839833 ] incorrect encoding/decoding of double-quote + +The following uncategorized improvements have been made: + + * Errors in typemap generation have been fixed + * XML parser speedups + * The test suite has been improved + 2.00_24 --- The following features were added (the numbers in square brackets are the @@ -84,7 +131,6 @@ The following uncategorized improvements have been made: * Code cleanup. The XSD library has been cleaned up a bit. Should result in a minor speedup in serializing and deserializing XML messages, - 2.00_21 - not released ---- The following bugs have been fixed (the numbers in square brackets are the diff --git a/HACKING b/HACKING index 6029227..4ebb710 100644 --- a/HACKING +++ b/HACKING @@ -61,7 +61,7 @@ The following guidelines apply: - Testing * SOAP::WSDL has a test coverage of >95% and aims at 100%. Please write a test first. - * Use uthor tests are for testing guidelines. Disable author tests for + * Use author tests for testing guidelines. Disable author tests for users - it's time consuming and of no use to have users run author tests. - Indentation and formatting @@ -69,9 +69,9 @@ The following guidelines apply: * indent 4 characters per level * use \n (LF) for newlines, not CRLF * use blank lines to separate paragraphs - * Coding style is similar to K&R (opening brace on last line, closing + * Coding style is similar to K&R (opening brace on last line, closing brace on new line. No cuddled else) - * No trailing spaces allowed (except to indicate a blank line in a POD + * No trailing spaces allowed (except to indicate a blank line in a POD source block) - Flow control @@ -88,7 +88,7 @@ The following guidelines apply: perlcritic fool you: no strict qw(refs); is often required. - Naming - * variable names are lower case with _ separating words, except when + * variable names are lower case with _ separating words, except when a XML Schema, SOAP, or WSDL name is name-giving (don't force portType to become port_type) * hashes should be named FOO_of, lists FOO_from, references FOO_ref. @@ -121,7 +121,7 @@ The following guidelines apply: $_[0]->foo($_[2..$#]); # read as $self->foo(%args_of); return; } - * POD is located at end of file, preferably after + * POD is located at end of file, preferably after __END__ * Complete POD coverage is essential. However, if the package in question is used internally only, it's better to omit the POD completely - too many PODs to look at confuse the average CPAN user. diff --git a/MAINFEST b/MAINFEST deleted file mode 100644 index 8b13789..0000000 --- a/MAINFEST +++ /dev/null @@ -1 +0,0 @@ - diff --git a/MANIFEST b/MANIFEST index 60235d9..e2a8278 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,11 +1,17 @@ benchmark/01_expat.t +benchmark/hello.pl benchmark/XSD/01_anyType.t benchmark/XSD/02_anySimpleType.t benchmark/XSD/03_string.t bin/wsdl2perl.pl Build.PL Changes +example/cgi-bin/helloworld.pl example/fortune.pl +example/genericbarcode.pl +example/hello.pl +example/hello_compile.pl +example/hello_lite.pl example/lib/MyElements/CountCookies.pm example/lib/MyElements/CountCookiesResponse.pm example/lib/MyElements/GenerateBarCode.pm @@ -21,15 +27,26 @@ example/lib/MyElements/GetWeatherResponse.pm example/lib/MyElements/int.pm example/lib/MyElements/readNodeCount.pm example/lib/MyElements/readNodeCountResponse.pm +example/lib/MyElements/sayHello.pm +example/lib/MyElements/sayHelloResponse.pm example/lib/MyElements/string.pm +example/lib/MyInterfaces/BarCode/BarCodeSoap.pm example/lib/MyInterfaces/FullerData_x0020_Fortune_x0020_Cookie/FullerData_x0020_Fortune_x0020_CookieSoap.pm example/lib/MyInterfaces/GlobalWeather/GlobalWeatherSoap.pm +example/lib/MyInterfaces/HelloWorld/HelloWorldSoap.pm +example/lib/MyServer/HelloWorld/HelloWorldSoap.pm +example/lib/MyTypemaps/BarCode.pm example/lib/MyTypemaps/FullerData_x0020_Fortune_x0020_Cookie.pm example/lib/MyTypemaps/GlobalWeather.pm +example/lib/MyTypemaps/HelloWorld.pm +example/lib/MyTypes/test2.pm +example/lib/MyTypes/testExtended.pm example/visitor/visitor.pl example/weather.pl example/weather_wsdl.pl +example/wsdl/11_helloworld.wsdl example/wsdl/FortuneCookie.xml +example/wsdl/genericbarcode.xml example/wsdl/globalweather.xml HACKING lib/SOAP/WSDL.pm @@ -78,6 +95,11 @@ 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/Server.tt +lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Message.tt +lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/method_info.tt +lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt +lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt 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 @@ -104,6 +126,8 @@ lib/SOAP/WSDL/Part.pm lib/SOAP/WSDL/Port.pm lib/SOAP/WSDL/PortType.pm lib/SOAP/WSDL/Serializer/XSD.pm +lib/SOAP/WSDL/Server.pm +lib/SOAP/WSDL/Server/CGI.pm lib/SOAP/WSDL/Service.pm lib/SOAP/WSDL/SOAP/Address.pm lib/SOAP/WSDL/SOAP/Body.pm @@ -173,16 +197,15 @@ lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm lib/SOAP/WSDL/XSD/Typelib/Element.pm lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm LICENSE -MAINFEST Makefile.PL -MANIFEST +MANIFEST This list of files META.yml +MIGRATING README t/001_use.t t/002_parse_wsdl.t t/003_wsdl_based_serializer.t t/004_parse_wsdl.t -t/005_parse_contributed.t t/006_client.t t/007_envelope.t t/008_client_wsdl_complexType.t @@ -192,8 +215,8 @@ t/012_element.t t/013_complexType.t t/016_client_object.t t/017_generator.t -t/018_compat_2_00_15-generator.t t/020_storable.t +t/096_characters.t t/097_kwalitee.t t/098_pod.t t/099_pod_coverage.t @@ -227,20 +250,16 @@ t/acceptance/wsdl/email_account.wsdl t/acceptance/wsdl/generator_test.wsdl t/acceptance/wsdl/generator_unsupported_test.wsdl t/acceptance/wsdl/message_gateway.wsdl -t/contributed.wsdl t/Expat/01_expat.t t/Expat/03_wsdl.t t/lib/MyComplexType.pm t/lib/MyElement.pm -t/lib/MyElements/GetWeather.pm -t/lib/MyElements/GetWeatherResponse.pm -t/lib/MyInterfaces/GlobalWeather.pm t/lib/MySimpleType.pm -t/lib/MyTypemaps/GlobalWeather.pm t/lib/Test/SOAPMessage.pm t/lib/Typelib/Base.pm t/lib/Typelib/TEnqueueMessage.pm t/lib/Typelib/TMessage.pm +t/SOAP/WSDL.t t/SOAP/WSDL/01_use.t t/SOAP/WSDL/02_port.t t/SOAP/WSDL/03_complexType-all.t @@ -259,9 +278,11 @@ t/SOAP/WSDL/05_simpleType-union.t t/SOAP/WSDL/06_keep_alive.t t/SOAP/WSDL/11_helloworld.NET.t t/SOAP/WSDL/12_binding.t +t/SOAP/WSDL/Client/Base.t t/SOAP/WSDL/Deserializer/Hash.t t/SOAP/WSDL/Deserializer/SOM.t t/SOAP/WSDL/Deserializer/XSD.t +t/SOAP/WSDL/Expat/Base.t t/SOAP/WSDL/Factory/Deserializer.t t/SOAP/WSDL/Factory/Serializer.t t/SOAP/WSDL/Factory/Transport.t @@ -271,6 +292,8 @@ t/SOAP/WSDL/Generator/Visitor/Typemap.t t/SOAP/WSDL/Generator/XCS.t t/SOAP/WSDL/Generator/XSD.t t/SOAP/WSDL/Generator/XSD_unsupported.t +t/SOAP/WSDL/Server.t +t/SOAP/WSDL/Server/CGI.t t/SOAP/WSDL/Transport/01_Test.t t/SOAP/WSDL/Transport/02_HTTP.t t/SOAP/WSDL/Transport/acceptance/test2.xml @@ -296,6 +319,7 @@ t/SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.t t/SOAP/WSDL/XSD/Typelib/Builtin/int.t t/SOAP/WSDL/XSD/Typelib/Builtin/integer.t t/SOAP/WSDL/XSD/Typelib/Builtin/language.t +t/SOAP/WSDL/XSD/Typelib/Builtin/list.t t/SOAP/WSDL/XSD/Typelib/Builtin/long.t t/SOAP/WSDL/XSD/Typelib/Builtin/Name.t t/SOAP/WSDL/XSD/Typelib/Builtin/NCName.t @@ -317,6 +341,11 @@ t/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.t t/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.t t/SOAP/WSDL/XSD/Typelib/ComplexType.t t/SOAP/WSDL/XSD/Typelib/Element.t +t/SOAP/WSDL_1.wsdl +t/SOAP/WSDL_EMPTY_DEFINITIONS.wsdl +t/SOAP/WSDL_NO_BINDING.wsdl +t/SOAP/WSDL_NO_MESSAGE.wsdl +t/SOAP/WSDL_NO_PORTTYPE.wsdl t/test.wsdl TEST_COVERAGE TODO diff --git a/META.yml b/META.yml index 0cd00ce..afcc327 100644 --- a/META.yml +++ b/META.yml @@ -1,6 +1,6 @@ --- name: SOAP-WSDL -version: 2.00_24 +version: 2.00_25 author: - 'Martin Kutter ' abstract: SOAP with WSDL support @@ -8,8 +8,13 @@ license: artistic resources: license: http://opensource.org/licenses/artistic-license.php requires: - Class::Std: v0.0.8 - Class::Std::Storable: 0 + Class::Std::Fast: !!perl/hash:version + original: v0.0.5 + qv: 1 + version: + - 0 + - 0 + - 5 Data::Dumper: 0 Date::Format: 0 Date::Parse: 0 @@ -25,30 +30,30 @@ requires: provides: SOAP::WSDL: file: lib/SOAP/WSDL.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Base: file: lib/SOAP/WSDL/Base.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Binding: file: lib/SOAP/WSDL/Binding.pm SOAP::WSDL::Client: file: lib/SOAP/WSDL/Client.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Client::Base: file: lib/SOAP/WSDL/Client/Base.pm - version: 2.00_24 + version: 2.00_25 SOAP::WSDL::Definitions: file: lib/SOAP/WSDL/Definitions.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Deserializer::Hash: file: lib/SOAP/WSDL/Deserializer/Hash.pm - version: 2.00_24 + version: 2.00_25 SOAP::WSDL::Deserializer::SOM: file: lib/SOAP/WSDL/Deserializer/SOM.pm version: 2.00_24 SOAP::WSDL::Deserializer::XSD: file: lib/SOAP/WSDL/Deserializer/XSD.pm - version: 2.00_24 + version: 2.00_25 SOAP::WSDL::Expat::Base: file: lib/SOAP/WSDL/Expat/Base.pm version: 2.00_24 @@ -57,7 +62,7 @@ provides: version: 2.00_24 SOAP::WSDL::Expat::MessageParser: file: lib/SOAP/WSDL/Expat/MessageParser.pm - version: 2.00_24 + version: 2.00_25 SOAP::WSDL::Expat::MessageStreamParser: file: lib/SOAP/WSDL/Expat/MessageStreamParser.pm version: 2.00_24 @@ -72,19 +77,21 @@ provides: version: 2.00_24 SOAP::WSDL::Factory::Transport: file: lib/SOAP/WSDL/Factory/Transport.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Generator::Template: file: lib/SOAP/WSDL/Generator/Template.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Generator::Template::XSD: file: lib/SOAP/WSDL/Generator/Template/XSD.pm + version: 2.00_25 SOAP::WSDL::Generator::Visitor: file: lib/SOAP/WSDL/Generator/Visitor.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Generator::Visitor::Typelib: file: lib/SOAP/WSDL/Generator/Visitor/Typelib.pm SOAP::WSDL::Generator::Visitor::Typemap: file: lib/SOAP/WSDL/Generator/Visitor/Typemap.pm + version: 2.00_25 SOAP::WSDL::Message: file: lib/SOAP/WSDL/Message.pm SOAP::WSDL::OpMessage: @@ -107,23 +114,29 @@ provides: file: lib/SOAP/WSDL/SOAP/HeaderFault.pm SOAP::WSDL::SOAP::Operation: file: lib/SOAP/WSDL/SOAP/Operation.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::SOAP::Typelib::Fault11: file: lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Serializer::XSD: file: lib/SOAP/WSDL/Serializer/XSD.pm - version: 2.00_24 + version: 2.00_25 + SOAP::WSDL::Server: + file: lib/SOAP/WSDL/Server.pm + version: 2.00_25 + SOAP::WSDL::Server::CGI: + file: lib/SOAP/WSDL/Server/CGI.pm + version: 2.00_25 SOAP::WSDL::Service: file: lib/SOAP/WSDL/Service.pm SOAP::WSDL::Transport::HTTP: file: lib/SOAP/WSDL/Transport/HTTP.pm SOAP::WSDL::Transport::Loopback: file: lib/SOAP/WSDL/Transport/Loopback.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::Transport::Test: file: lib/SOAP/WSDL/Transport/Test.pm - version: 2.00_14 + version: 2.00_25 SOAP::WSDL::TypeLookup: file: lib/SOAP/WSDL/TypeLookup.pm SOAP::WSDL::Types: @@ -132,20 +145,21 @@ provides: file: lib/SOAP/WSDL/XSD/Builtin.pm SOAP::WSDL::XSD::ComplexType: file: lib/SOAP/WSDL/XSD/ComplexType.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::XSD::Element: file: lib/SOAP/WSDL/XSD/Element.pm - version: 2.00_22 + version: 2.00_25 SOAP::WSDL::XSD::Schema: file: lib/SOAP/WSDL/XSD/Schema.pm + version: 2.00_25 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_17 + version: 2.00_25 SOAP::WSDL::XSD::Typelib::Builtin: file: lib/SOAP/WSDL/XSD/Typelib/Builtin.pm - version: 2.00_17 + version: 2.00_25 SOAP::WSDL::XSD::Typelib::Builtin::ENTITY: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm SOAP::WSDL::XSD::Typelib::Builtin::ID: @@ -176,7 +190,7 @@ provides: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm SOAP::WSDL::XSD::Typelib::Builtin::boolean: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm - version: 2.00_17 + version: 2.00_23 SOAP::WSDL::XSD::Typelib::Builtin::byte: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm SOAP::WSDL::XSD::Typelib::Builtin::date: @@ -229,7 +243,7 @@ provides: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm SOAP::WSDL::XSD::Typelib::Builtin::time: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm - version: 2.00_18 + version: 2.00_25 SOAP::WSDL::XSD::Typelib::Builtin::token: file: lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte: @@ -242,10 +256,10 @@ 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_24 + version: 2.00_25 SOAP::WSDL::XSD::Typelib::Element: file: lib/SOAP/WSDL/XSD/Typelib/Element.pm - version: 2.00_24 + version: 2.00_25 SOAP::WSDL::XSD::Typelib::SimpleType: file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm SOAP::WSDL::XSD::Typelib::SimpleType::restriction: diff --git a/MIGRATING b/MIGRATING new file mode 100644 index 0000000..5b0095c --- /dev/null +++ b/MIGRATING @@ -0,0 +1,50 @@ +MIGRATING +--------- + +This document describes how to migrate from 2.00_24 and before versions to +2.00_25. + +Migrating from 2.00_xx +---------------------- + +Background + +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 +no need to change anything in your (handwritten) code. + +Generated interfaces + +SOAP::WSDL's internal structure has changed, and this change needs to +be reflected in all generated classes. + +This means you have to re-generate your interfaces (in case you use generated +interfaces) + +Typemaps + +SOAP::WSDL now tries to load all typemap classes at once from 2.00_25 on. + +If you use __SKIP__ in your typemaps, you'll have to comment out all +path deeper than the path marked with __SKIP__ - if you don't, SOAP::WSDL +will try to load all correspondent classes. + +Migrating from 1.xx +------------------- + +Background + +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. +SOAP::WSDL is the compatibility module for old interfaces. + +Overloading + +Message overloading (as introduced in 1.23) is not supported any more. + +Message overloading is prohibited by the WS-I basic profile, therefore +SOAP::WSDL does not implement it any more. \ No newline at end of file diff --git a/benchmark/01_expat.t b/benchmark/01_expat.t index 684cc29..5b833de 100644 --- a/benchmark/01_expat.t +++ b/benchmark/01_expat.t @@ -1,16 +1,16 @@ #!/usr/bin/perl -w %DB::packages=(SOAP::WSDL::Expat::MessageParser => 1); -%DB::packages=(SOAP::WSDL::Expat::MessageParser => 1); use strict; use warnings; use lib '../lib'; -use lib 'lib'; +use lib '../../Class-Std-Fast/lib'; use lib '../t/lib'; # use SOAP::WSDL::SAX::MessageHandler; use Benchmark qw(cmpthese timethese); use SOAP::WSDL::Expat::MessageParser; use SOAP::WSDL::Expat::Message2Hash; +use SOAP::Lite; use XML::Simple; use XML::LibXML; use MyComplexType; @@ -55,6 +55,8 @@ my $libxml = XML::LibXML->new(); $libxml->keep_blanks(0); my @data; +my $deserializer = SOAP::Deserializer->new(); + sub libxml_test { my $dom = $libxml->parse_string( $xml ); push @data, dom2hash( $dom->firstChild ); @@ -100,11 +102,9 @@ cmpthese 5000, 'XML::Simple (Hash)' => sub { push @data, XMLin $xml }, 'XML::LibXML (DOM)' => sub { push @data, $libxml->parse_string( $xml ) }, 'XML::LibXML (Hash)' => \&libxml_test, + 'SOAP::Lite' => sub { push @data, $deserializer->deserialize( $xml ) }, }; - -# for (1..10000) { push @data, $parser->parse( $xml ) }; - # data classes reside in t/lib/Typelib/ BEGIN { package FakeResolver; @@ -115,6 +115,8 @@ BEGIN { 'MyAtomicComplexTypeElement/test/test2' => 'MyTestElement2', ); + sub get_typemap { return \%class_list; }; + sub get_map { return \%class_list }; sub new { return bless {}, 'FakeResolver' }; diff --git a/benchmark/XSD/02_anySimpleType.t b/benchmark/XSD/02_anySimpleType.t index 54bb93a..011b708 100644 --- a/benchmark/XSD/02_anySimpleType.t +++ b/benchmark/XSD/02_anySimpleType.t @@ -2,6 +2,8 @@ use strict; use warnings; use Benchmark; use lib '../../lib'; +use lib '../../../Class-Std-Fast/lib'; + use SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType; my $obj = SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType->new(); @@ -19,3 +21,37 @@ timethese 1000000, { 'set_FOO' => sub { $obj->set_value('Test') }, 'get_FOO' => sub { $data = $obj->get_value() }, }; + +__END__ + +Benchmark: timing 10000 iterations of new, new + params, set_FOO... + new: 0 wallclock secs ( 0.83 usr + 0.00 sys = 0.83 CPU) @ 12048.19/s (n=10000) +new + params: 1 wallclock secs ( 0.58 usr + 0.00 sys = 0.58 CPU) @ 17241.38/s (n=10000) + set_FOO: 0 wallclock secs ( 0.01 usr + 0.00 sys = 0.01 CPU) @ 1000000.00/s (n=10000) + (warning: too few iterations for a reliable count) +Benchmark: timing 1000000 iterations of get_FOO, set_FOO... + get_FOO: 1 wallclock secs ( 1.79 usr + 0.01 sys = 1.80 CPU) @ 555555.56/s (n=1000000) + set_FOO: 2 wallclock secs ( 1.44 usr + 0.03 sys = 1.47 CPU) @ 680272.11/s (n=1000000) + +## Fast: +Benchmark: timing 10000 iterations of new, new + params, set_FOO... + new: 1 wallclock secs ( 0.67 usr + 0.01 sys = 0.68 CPU) @ 14705.88/s (n=10000) +new + params: 1 wallclock secs ( 0.54 usr + 0.00 sys = 0.54 CPU) @ 18518.52/s (n=10000) + set_FOO: 0 wallclock secs ( 0.01 usr + 0.00 sys = 0.01 CPU) @ 1000000.00/s (n=10000) + (warning: too few iterations for a reliable count) +Benchmark: timing 1000000 iterations of get_FOO, set_FOO... + get_FOO: 2 wallclock secs ( 1.11 usr + 0.00 sys = 1.11 CPU) @ 900900.90/s (n=1000000) + set_FOO: 2 wallclock secs ( 0.80 usr + 0.00 sys = 0.80 CPU) @ 1250000.00/s (n=1000000) + +## Fast qw(2); +Benchmark: timing 10000 iterations of new, new + params, set_FOO... + new: 1 wallclock secs ( 0.17 usr + 0.00 sys = 0.17 CPU) @ 58823.53/s (n=10000) + (warning: too few iterations for a reliable count) +new + params: 0 wallclock secs ( 0.19 usr + 0.00 sys = 0.19 CPU) @ 52631.58/s (n=10000) + (warning: too few iterations for a reliable count) + set_FOO: 0 wallclock secs ( 0.01 usr + 0.00 sys = 0.01 CPU) @ 1000000.00/s (n=10000) + (warning: too few iterations for a reliable count) +Benchmark: timing 1000000 iterations of get_FOO, set_FOO... + get_FOO: 1 wallclock secs ( 1.12 usr + 0.00 sys = 1.12 CPU) @ 892857.14/s (n=1000000) + set_FOO: 0 wallclock secs ( 0.80 usr + 0.01 sys = 0.81 CPU) @ 1234567.90/s (n=1000000) + diff --git a/benchmark/XSD/03_string.t b/benchmark/XSD/03_string.t index 0bffeb4..6f85b7b 100644 --- a/benchmark/XSD/03_string.t +++ b/benchmark/XSD/03_string.t @@ -2,6 +2,8 @@ use strict; use warnings; use Benchmark; use lib '../../lib'; +use lib '../../../Class-Std-Fast/lib'; + use SOAP::WSDL::XSD::Typelib::Builtin::string; my $obj = SOAP::WSDL::XSD::Typelib::Builtin::string->new(); @@ -23,3 +25,32 @@ timethese 1000000, { 'set_FOO' => sub { $obj->set_value('Test') }, 'get_FOO' => sub { $data = $obj->get_value() }, }; + + + +__END__ + +Benchmark: timing 20000 iterations of new, new + params... + new: 1 wallclock secs ( 0.41 usr + 0.00 sys = 0.41 CPU) @ 48780.49/s (n=20000) +new + params: 1 wallclock secs ( 0.53 usr + 0.01 sys = 0.54 CPU) @ 37037.04/s (n=20000) +Benchmark: timing 1000000 iterations of get_FOO, set_FOO... + get_FOO: 2 wallclock secs ( 1.43 usr + 0.01 sys = 1.44 CPU) @ 694444.44/s (n=1000000) + set_FOO: 0 wallclock secs ( 1.43 usr + 0.01 sys = 1.44 CPU) @ 694444.44/s (n=1000000) + + +::Fast +--- +Benchmark: timing 20000 iterations of new, new + params... + new: 0 wallclock secs ( 0.44 usr + 0.01 sys = 0.45 CPU) @ 44444.44/s (n=20000) +new + params: 1 wallclock secs ( 0.55 usr + 0.00 sys = 0.55 CPU) @ 36363.64/s (n=20000) +Benchmark: timing 1000000 iterations of get_FOO, set_FOO... + get_FOO: 0 wallclock secs ( 0.81 usr + 0.00 sys = 0.81 CPU) @ 1234567.90/s (n=1000000) + set_FOO: 2 wallclock secs ( 0.87 usr + 0.01 sys = 0.88 CPU) @ 1136363.64/s (n=1000000) + +::Fast with inlined ID +Benchmark: timing 20000 iterations of new, new + params... + new: 0 wallclock secs ( 0.41 usr + 0.00 sys = 0.41 CPU) @ 48780.49/s (n=20000) +new + params: 1 wallclock secs ( 0.52 usr + 0.00 sys = 0.52 CPU) @ 38461.54/s (n=20000) +Benchmark: timing 1000000 iterations of get_FOO, set_FOO... + get_FOO: 2 wallclock secs ( 0.80 usr + 0.00 sys = 0.80 CPU) @ 1250000.00/s (n=1000000) + set_FOO: 2 wallclock secs ( 0.89 usr + -0.01 sys = 0.88 CPU) @ 1136363.64/s (n=1000000) \ No newline at end of file diff --git a/benchmark/hello.pl b/benchmark/hello.pl new file mode 100644 index 0000000..328a904 --- /dev/null +++ b/benchmark/hello.pl @@ -0,0 +1,69 @@ +#!/usr/bin/perl -w +use strict; +use warnings; +use lib '../example/lib'; +use lib '/home/martin/workspace/SOAP-WSDL-Fast_XS/blib/lib'; +use lib '/home/martin/workspace/SOAP-WSDL-Fast_XS/blib/arch'; +use SOAP::Lite; +use XML::Compile::WSDL11; +use XML::Compile::Transport::SOAPHTTP; +use MyInterfaces::HelloWorld::HelloWorldSoap; +use SOAP::WSDL::Deserializer::XSD_XS; +use Benchmark qw(cmpthese); + +my $lite = SOAP::Lite->new( + proxy => 'http://localhost:81/soap-wsdl-test/helloworld.pl' +); + +$lite->on_action( sub { "urn:HelloWorld#sayHello" }); +$lite->autotype(0); + +my $soap = MyInterfaces::HelloWorld::HelloWorldSoap->new(); + +my $soap_xs = MyInterfaces::HelloWorld::HelloWorldSoap->new(); +$soap_xs->set_deserializer( SOAP::WSDL::Deserializer::XSD_XS->new() ); + +my @result; + +sub wsdl_bench { + push @result, $soap->sayHello({ + name => $ARGV[1] || '"Your name"', + givenName => $ARGV[0] || '"Your given name"', + }); +} + +sub wsdl_xs_bench { + push @result, $soap_xs->sayHello({ + name => $ARGV[1] || '"Your name"', + givenName => $ARGV[0] || '"Your given name"', + }); +} + +my $wsdl = XML::Compile::WSDL11->new('../example/wsdl/11_helloworld.wsdl'); +my $call = $wsdl->compileClient('sayHello'); + +sub compile_bench { + push @result, $call->( + name => $ARGV[1] || '"Your name"', + givenName => $ARGV[0] || '"Your given name"', + ); +} + +sub lite_bench { + push @result, $lite->call( + SOAP::Data->name("sayHello") + ->attr({ xmlns => 'urn:HelloWorld' }), + SOAP::Data->name('name')->value( $ARGV[1] || '"Your name"'), + SOAP::Data->name('givenName')->value( $ARGV[0] || '"Your given name"'), + ); +} + +wsdl_bench(); +wsdl_xs_bench(); + +cmpthese 150, { + 'SOAP::WSDL' => \&wsdl_bench, + 'SOAP::WSDL_XS' => \&wsdl_xs_bench, + 'XML::Compile' => \&compile_bench, + # 'SOAP::Lite' => \&lite_bench, +} diff --git a/bin/wsdl2perl.pl b/bin/wsdl2perl.pl index 6935601..a642a06 100644 --- a/bin/wsdl2perl.pl +++ b/bin/wsdl2perl.pl @@ -18,6 +18,7 @@ my %opt = ( base_path => 'lib/', proxy => undef, generator => 'XSD', + server => 0, ); { # a block just to scope "no warnings" @@ -59,6 +60,7 @@ GetOptions(\%opt, user=s password=s generator=s + server ) ); @@ -114,7 +116,8 @@ $generator->set_wsdl($xml) if $generator->can('set_wsdl'); # start with typelib, as errors will most likely occur here... $generator->generate(); - +$generator->generate_interface() if ! $opt{server}; +$generator->generate_server() if $opt{server}; __END__ =pod @@ -153,6 +156,8 @@ wsdl2perl.pl - create perl bindings for SOAP webservices. password Password. wsdl2perl will prompt if not given. generator g Generator to use. Default: XSD + server s Generate a server interface (currently only CGI + supported) help h Show help content =head1 DESCRIPTION @@ -169,6 +174,13 @@ The following classes are created: Interface classes are what you will mainly deal with: They provide a method for accessing every web service method. +If you chose to generate Server interfaces, a class for every SOAP port in +every Web service. + +You'll have to implement a method for each of the implemented methods. You +may implement these methods in the CGI script / handler, or in any class +to dispatch calls to. + =item * A typemap for every service Typemaps are used internally by SOAP::WSDL for parsing the SOAP message into diff --git a/example/cgi-bin/helloworld.pl b/example/cgi-bin/helloworld.pl new file mode 100755 index 0000000..5aa1536 --- /dev/null +++ b/example/cgi-bin/helloworld.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl -w +use strict; +use warnings; +use lib '../../lib'; +use lib '../lib'; +use MyServer::HelloWorld::HelloWorldSoap; + +my $soap = MyServer::HelloWorld::HelloWorldSoap->new({ + dispatch_to => 'main', +}); + +$soap->handle(); + +sub sayHello { + my ($self, $body, $header) = @_; + my $name = $body->get_name(); + my $givenName = $body->get_givenName(); + + return MyElements::sayHelloResponse->new({ + sayHelloResult => "Hello $givenName $name" + }) +} + +=pod + +=head1 NAME + +helloworld.pl - a simple CGI-based SOAP server implementing the service from +in examples/wsdl/helloworld.wsdl + +=head1 USAGE + +Before using this script, you should secure your webserver. The easiest way +to do so is to let it listen to 127.0.0.1 only. + +Then make a ScriptAlias named /soap-wsdl-test/ pointing at the directory +this file lies in. + +For my apache, it looks like this: + + ScriptAlias /soap-wsdl-test/ /home/martin/workspace/SOAP-WSDL/example/cgi-bin/ + + AllowOverride None + Options +ExecCGI -MultiViews + Order allow,deny + Allow from all + + +Then run the helloworld.pl from the examples directory. It should print + + Hello World + +=head1 DESCRIPTION + +=cut \ No newline at end of file diff --git a/example/genericbarcode.pl b/example/genericbarcode.pl new file mode 100644 index 0000000..e874be3 --- /dev/null +++ b/example/genericbarcode.pl @@ -0,0 +1,29 @@ +use lib 'lib'; +use lib '../lib'; +use MyInterfaces::BarCode::BarCodeSoap; +my $interface = MyInterfaces::BarCode::BarCodeSoap->new(); +my $barcode = $interface->GenerateBarCode( { + BarCodeParam => { # MyTypes::BarCodeData + Height => 42, # int + Width => 120, # int + Angle => 90, # int + Ratio => 1, # int + Module => 1, # int + Left => 10, # int + Top => 10, # int + CheckSum => 0, # boolean + FontName => 'Arial', # string + BarColor => 'black', # string + BGColor => 'white', # string + FontSize => 6.25, # float + barcodeOption => 'Both', # BarcodeOption + barcodeType => 'CodeMSI', # BarcodeType + checkSumMethod => 'None', # CheckSumMethod + showTextPosition => 'TopLeft', # ShowTextPosition + BarCodeImageFormat => 'PNG', # ImageFormats + }, + BarCodeText => 'JustSomeText', # string + }, + ); +die $barcode if not ($barcode); +print $barcode; diff --git a/example/hello.pl b/example/hello.pl new file mode 100644 index 0000000..1725719 --- /dev/null +++ b/example/hello.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl -w +use strict; +use warnings; +use lib 'lib'; + +# I have to generate the interface using wsdl2perl.pl before +use MyInterfaces::HelloWorld::HelloWorldSoap; + +my $soap = MyInterfaces::HelloWorld::HelloWorldSoap->new(); + +# I have to lookup the method and synopsis from the interface's pod +my $result = $soap->sayHello({ + name => $ARGV[1] || '"Your name"', + givenName => $ARGV[0] || '"Your given name"', +}); + +die $result if not $result; + +# I have to lookup the output parameter from the interface's POD - or try: +# Bad method names will die with a list of available methods +print $result->get_sayHelloResult(), "\n"; \ No newline at end of file diff --git a/example/hello_compile.pl b/example/hello_compile.pl new file mode 100644 index 0000000..94edeed --- /dev/null +++ b/example/hello_compile.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl -w +use strict; +use warnings; +use XML::Compile::WSDL11; +use XML::Compile::Transport::SOAPHTTP; + +my $wsdl = XML::Compile::WSDL11->new('wsdl/11_helloworld.wsdl'); + +# I have to lookup the methods from the WSDL +my $call = $wsdl->compileClient('sayHello'); + +# I have to lookup the parameters from the WSDL +my $result = $call->( + name => $ARGV[1] || '"Your name"', + givenName => $ARGV[0] || '"Your given name"', +); + +die "Error calling soap method" if not defined $result; + +# I have to lookup the output parameters from the WSDL - or try Dumper +print $result->{ parameters }->{ sayHelloResult }, "\n"; \ No newline at end of file diff --git a/example/hello_lite.pl b/example/hello_lite.pl new file mode 100644 index 0000000..3f99fe1 --- /dev/null +++ b/example/hello_lite.pl @@ -0,0 +1,27 @@ +#!/usr/bin/perl -w +use strict; +use warnings; +use SOAP::Lite; + +# I have to lookup the URL from the WSDL +my $soap = SOAP::Lite->new( + proxy => 'http://localhost:81/soap-wsdl-test/helloworld.pl' +); + +# I have to lookup the SOAPAction from the WSDL +$soap->on_action( sub { "urn:HelloWorld#sayHello" }); +$soap->autotype(0); + +# I have to lookup the top level element's namespace from the WSDL +# I have to encode all parameters as SOAP::Data objects +# I have to know the order of parameters +my $som = $soap->call( + SOAP::Data->name("sayHello") + ->attr({ xmlns => 'urn:HelloWorld' }), + SOAP::Data->name('name')->value( $ARGV[1] || '"Your name"'), + SOAP::Data->name('givenName')->value( $ARGV[0] || '"Your given name"'), +); + +die $som->fault->{ faultstring } if ($som->fault); + +print $som->result, "\n"; \ No newline at end of file diff --git a/example/lib/MyElements/sayHello.pm b/example/lib/MyElements/sayHello.pm new file mode 100644 index 0000000..9a0fb77 --- /dev/null +++ b/example/lib/MyElements/sayHello.pm @@ -0,0 +1,86 @@ +package MyElements::sayHello; +use strict; +use warnings; + +{ # BLOCK to scope variables + +sub get_xmlns { 'urn:HelloWorld' } + +__PACKAGE__->__set_name('sayHello'); +__PACKAGE__->__set_nillable(); +__PACKAGE__->__set_minOccurs(); +__PACKAGE__->__set_maxOccurs(); +__PACKAGE__->__set_ref(); + +use base qw( + SOAP::WSDL::XSD::Typelib::Element + SOAP::WSDL::XSD::Typelib::ComplexType +); +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %name_of :ATTR(:get); +my %givenName_of :ATTR(:get); + +__PACKAGE__->_factory( + [ qw( + name + givenName + ) ], + { + name => \%name_of, + givenName => \%givenName_of, + }, + { + name => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + givenName => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + } +); + +} # end BLOCK + + + + + + + +} # end of BLOCK +1; + +# __END__ + +=pod + +=head1 NAME + +MyElements::sayHello + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined element +sayHello from the namespace urn:HelloWorld. + +=head1 METHODS + +=head2 new + + my $element = MyElements::sayHello->new($data); + +Constructor. The following data structure may be passed to new(): + + { + name => $some_value, # string + givenName => $some_value, # string + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/example/lib/MyElements/sayHelloResponse.pm b/example/lib/MyElements/sayHelloResponse.pm new file mode 100644 index 0000000..3d60631 --- /dev/null +++ b/example/lib/MyElements/sayHelloResponse.pm @@ -0,0 +1,81 @@ +package MyElements::sayHelloResponse; +use strict; +use warnings; + +{ # BLOCK to scope variables + +sub get_xmlns { 'urn:HelloWorld' } + +__PACKAGE__->__set_name('sayHelloResponse'); +__PACKAGE__->__set_nillable(); +__PACKAGE__->__set_minOccurs(); +__PACKAGE__->__set_maxOccurs(); +__PACKAGE__->__set_ref(); + +use base qw( + SOAP::WSDL::XSD::Typelib::Element + SOAP::WSDL::XSD::Typelib::ComplexType +); +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %sayHelloResult_of :ATTR(:get); + +__PACKAGE__->_factory( + [ qw( + sayHelloResult + ) ], + { + sayHelloResult => \%sayHelloResult_of, + }, + { + sayHelloResult => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + } +); + +} # end BLOCK + + + + + + + +} # end of BLOCK +1; + +# __END__ + +=pod + +=head1 NAME + +MyElements::sayHelloResponse + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined element +sayHelloResponse from the namespace urn:HelloWorld. + +=head1 METHODS + +=head2 new + + my $element = MyElements::sayHelloResponse->new($data); + +Constructor. The following data structure may be passed to new(): + + { + sayHelloResult => $some_value, # string + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/example/lib/MyInterfaces/BarCode/BarCodeSoap.pm b/example/lib/MyInterfaces/BarCode/BarCodeSoap.pm new file mode 100644 index 0000000..facf9ff --- /dev/null +++ b/example/lib/MyInterfaces/BarCode/BarCodeSoap.pm @@ -0,0 +1,133 @@ +package MyInterfaces::BarCode::BarCodeSoap; +use strict; +use warnings; +use Class::Std::Storable; +use base qw(SOAP::WSDL::Client::Base); + +# only load if it hasn't been loaded before +require MyTypemaps::BarCode + if not MyTypemaps::BarCode->can('get_class'); + +sub START { + $_[0]->set_proxy('http://www.webservicex.net/genericbarcode.asmx') if not $_[2]->{proxy}; + $_[0]->set_class_resolver('MyTypemaps::BarCode') + if not $_[2]->{class_resolver}; +} + +sub GenerateBarCode { + my ($self, $body, $header) = @_; + return $self->SUPER::call({ + operation => 'GenerateBarCode', + soap_action => 'http://www.webservicex.net/GenerateBarCode', + style => 'document', + body => { + + 'use' => 'literal', + namespace => '', + encodingStyle => '', + parts => [qw( MyElements::GenerateBarCode )], + }, + header => { + + }, + headerfault => { + + } + }, $body, $header); +} + + + +1; + + + +__END__ + +=pod + +=head1 NAME + + +MyInterfaces::BarCode::BarCodeSoap - SOAP Interface for the BarCode Web Service + +=head1 SYNOPSIS + + use MyInterfaces::BarCode::BarCodeSoap; + my $interface = MyInterfaces::BarCode::BarCodeSoap->new(); + + my $response; + $response = $interface->GenerateBarCode(); + + + +=head1 DESCRIPTION + +SOAP Interface for the BarCode web service +located at http://www.webservicex.net/genericbarcode.asmx. + +=head1 SERVICE BarCode + +Barcode generator + +=head2 Port BarCodeSoap + + + +=head1 METHODS + +=head2 General methods + +=head3 new + +Constructor. + +All arguments are forwarded to L. + +=head2 SOAP Service methods + +Method synopsis is displayed with hash refs as parameters. + +The commented class names in the method's parameters denote that objects +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. + + + +=head3 GenerateBarCode + +WebserviceX.NET barcode library that provides the means to create barcodes for printing and display in any internet enabled applications. This web service supports Code 128, Industrial 2 of 5, Interleaved 2 of 5, Code 2 5 Matrix, Code 39, Code 39 Extended, Code 93, Code 93 Extended, Codabar, EAN13, EAN8, MSI, Postnet, Supp2, Supp5, UPC A, UPC E0 and UPC E1 barcode formats. This Barcodes returns byte image. It supports following image format JPEG, GIF, PNG, BMP, EMF, EXIF, ICON, MEMORY BMP, TIFF and WMF. + + $interface->GenerateBarCode( { + BarCodeParam => { # MyTypes::BarCodeData + Height => $some_value, # int + Width => $some_value, # int + Angle => $some_value, # int + Ratio => $some_value, # int + Module => $some_value, # int + Left => $some_value, # int + Top => $some_value, # int + CheckSum => $some_value, # boolean + FontName => $some_value, # string + BarColor => $some_value, # string + BGColor => $some_value, # string + FontSize => $some_value, # float + barcodeOption => $some_value, # BarcodeOption + barcodeType => $some_value, # BarcodeType + checkSumMethod => $some_value, # CheckSumMethod + showTextPosition => $some_value, # ShowTextPosition + BarCodeImageFormat => $some_value, # ImageFormats + }, + BarCodeText => $some_value, # string + },, + ); + + + +=head1 AUTHOR + +Generated by SOAP::WSDL on Fri Nov 9 00:18:35 2007 + +=pod \ No newline at end of file diff --git a/example/lib/MyInterfaces/HelloWorld/HelloWorldSoap.pm b/example/lib/MyInterfaces/HelloWorld/HelloWorldSoap.pm new file mode 100644 index 0000000..fc9e814 --- /dev/null +++ b/example/lib/MyInterfaces/HelloWorld/HelloWorldSoap.pm @@ -0,0 +1,117 @@ +package MyInterfaces::HelloWorld::HelloWorldSoap; +use strict; +use warnings; +use Class::Std::Fast::Storable; +use Scalar::Util qw(blessed); +use base qw(SOAP::WSDL::Client::Base); + +# only load if it hasn't been loaded before +require MyTypemaps::HelloWorld + if not MyTypemaps::HelloWorld->can('get_class'); + +sub START { + $_[0]->set_proxy('http://localhost:81/soap-wsdl-test/helloworld.pl') if not $_[2]->{proxy}; + $_[0]->set_class_resolver('MyTypemaps::HelloWorld') + if not $_[2]->{class_resolver}; +} + +sub sayHello { + my ($self, $body, $header) = @_; + die "sayHello must be called as object method (\$self is <$self>)" if not blessed($self); + return $self->SUPER::call({ + operation => 'sayHello', + soap_action => 'urn:HelloWorld#sayHello', + style => 'document', + body => { + + 'use' => 'literal', + namespace => '', + encodingStyle => '', + parts => [qw( MyElements::sayHello )], + }, + header => { + + }, + headerfault => { + + } + }, $body, $header); +} + + + +1; + + + +__END__ + +=pod + +=head1 NAME + + +MyInterfaces::HelloWorld::HelloWorldSoap - SOAP Interface for the HelloWorld Web Service + +=head1 SYNOPSIS + + use MyInterfaces::HelloWorld::HelloWorldSoap; + my $interface = MyInterfaces::HelloWorld::HelloWorldSoap->new(); + + my $response; + $response = $interface->sayHello(); + + + +=head1 DESCRIPTION + +SOAP Interface for the HelloWorld web service +located at http://localhost:81/soap-wsdl-test/helloworld.pl. + +=head1 SERVICE HelloWorld + + + +=head2 Port HelloWorldSoap + + + +=head1 METHODS + +=head2 General methods + +=head3 new + +Constructor. + +All arguments are forwarded to L. + +=head2 SOAP Service methods + +Method synopsis is displayed with hash refs as parameters. + +The commented class names in the method's parameters denote that objects +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. + + + +=head3 sayHello + + + + $interface->sayHello( { + name => $some_value, # string + givenName => $some_value, # string + },, + ); + + + +=head1 AUTHOR + +Generated by SOAP::WSDL on Sat Dec 1 19:51:31 2007 + +=pod \ No newline at end of file diff --git a/example/lib/MyServer/HelloWorld/HelloWorldSoap.pm b/example/lib/MyServer/HelloWorld/HelloWorldSoap.pm new file mode 100644 index 0000000..fdf839b --- /dev/null +++ b/example/lib/MyServer/HelloWorld/HelloWorldSoap.pm @@ -0,0 +1,113 @@ +package MyServer::HelloWorld::HelloWorldSoap; +use strict; +use warnings; +use Class::Std::Fast::Storable; +use Scalar::Util qw(blessed); +use base qw(SOAP::WSDL::Client::Base); + +# only load if it hasn't been loaded before +require MyTypemaps::HelloWorld + if not MyTypemaps::HelloWorld->can('get_class'); + +my %transport_class_of :ATTR(:name :default); +my %transport_of :ATTR(:name :default<()>); +my %dispatch_to :ATTR(:name); + +my $action_map_ref = { + 'urn:HelloWorld#sayHello' => 'sayHello', + +}; + +sub START { + my ($self, $ident, $arg_ref) = @_; + eval "require $transport_class_of{ $ident }" + or die "Cannot load transport class $transport_class_of{ $ident }: $@"; + $transport_of{ $ident } = $transport_class_of{ $ident }->new({ + action_map_ref => $action_map_ref, + class_resolver => 'MyTypemaps::HelloWorld', + dispatch_to => $dispatch_to{ $ident }, + }); +} + +sub handle { + $transport_of{ ${ $_[0] } }->handle(); +} + +1; + + + +__END__ + +=pod + +=head1 NAME + +MyInterfaces::HelloWorld::HelloWorldSoap - SOAP Server Class for the HelloWorld Web Service + +=head1 SYNOPSIS + + use MyServer::HelloWorld::HelloWorldSoap; + my $server = MyServer::HelloWorld::HelloWorldSoap->new({ + dispatch_to => 'My::Handler::Class', + transport_class => 'SOAP::WSDL::Server::CGI', # optional, default + }); + $server->handle(); + + +=head1 DESCRIPTION + +SOAP Server handler for the HelloWorld web service +located at http://localhost:81/soap-wsdl-test/helloworld.pl. + +=head1 SERVICE HelloWorld + + + +=head2 Port HelloWorldSoap + + + +=head1 METHODS + +=head2 General methods + +=head3 new + +Constructor. + +The C argument is mandatory. It must be a class or object +implementing the SOAP Service methods listed below. + +=head2 SOAP Service methods + +Your dispatch_to class has to implement the following methods: + +The examples below serve as copy-and-paste prototypes to use in your +class. + +=head3 sayHello + + + + sub sayHello( + my ($self, $body, $header) = @_; + # body is a ??? object - sorry, POD not implemented yet + # header is a ??? object - sorry, POD not implemented yet + + # do something with body and header... + + return MyElements::sayHelloResponse->new( { + sayHelloResult => $some_value, # string + }, + ); + + } + + + +=head1 AUTHOR + +Generated by SOAP::WSDL on Sun Dec 2 01:20:36 2007 + +=pod \ No newline at end of file diff --git a/example/lib/MyTypemaps/BarCode.pm b/example/lib/MyTypemaps/BarCode.pm new file mode 100644 index 0000000..eac7c8b --- /dev/null +++ b/example/lib/MyTypemaps/BarCode.pm @@ -0,0 +1,57 @@ +package MyTypemaps::BarCode; +use strict; +use warnings; + +our $typemap_1 = { + 'GenerateBarCode/BarCodeText' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'GenerateBarCode/BarCodeParam/BarColor' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'GenerateBarCode/BarCodeParam/barcodeOption' => 'MyTypes::BarcodeOption', + 'GenerateBarCode/BarCodeParam/Left' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI', + 'GenerateBarCode' => 'MyElements::GenerateBarCode', + 'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'GenerateBarCode/BarCodeParam/Width' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'GenerateBarCode/BarCodeParam/Angle' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11', + 'GenerateBarCode/BarCodeParam/BarCodeImageFormat' => 'MyTypes::ImageFormats', + 'GenerateBarCode/BarCodeParam/BGColor' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'GenerateBarCode/BarCodeParam/Ratio' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::TOKEN', + 'GenerateBarCode/BarCodeParam/Height' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'GenerateBarCode/BarCodeParam/CheckSum' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean', + 'GenerateBarCode/BarCodeParam/checkSumMethod' => 'MyTypes::CheckSumMethod', + 'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'GenerateBarCode/BarCodeParam/barcodeType' => 'MyTypes::BarcodeType', + 'GenerateBarCode/BarCodeParam/FontSize' => 'SOAP::WSDL::XSD::Typelib::Builtin::float', + 'GenerateBarCode/BarCodeParam/Top' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'GenerateBarCodeResponse/GenerateBarCodeResult' => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary', + 'GenerateBarCodeResponse' => 'MyElements::GenerateBarCodeResponse', + 'GenerateBarCode/BarCodeParam/Module' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'GenerateBarCode/BarCodeParam' => 'MyTypes::BarCodeData', + 'GenerateBarCode/BarCodeParam/showTextPosition' => 'MyTypes::ShowTextPosition', + 'GenerateBarCode/BarCodeParam/FontName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string' + }; +; + +sub get_class { + my $name = join '/', @{ $_[1] }; + exists $typemap_1->{ $name } or die "Cannot resolve $name via " . __PACKAGE__; + return $typemap_1->{ $name }; +} + +1; + +__END__ + +=pod + +=head1 NAME + +MyTypemaps::BarCode; - typemap for ::BarCode; + +=head1 DESCRIPTION + +Typemap created by SOAP::WSDL for map-based SOAP message parsers. + +=cut + diff --git a/example/lib/MyTypemaps/HelloWorld.pm b/example/lib/MyTypemaps/HelloWorld.pm new file mode 100644 index 0000000..1a86e9e --- /dev/null +++ b/example/lib/MyTypemaps/HelloWorld.pm @@ -0,0 +1,44 @@ +package MyTypemaps::HelloWorld; +use strict; +use warnings; + +our $typemap_1 = { + 'sayHello/givenName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'sayHelloResponse' => 'MyElements::sayHelloResponse', + 'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token', + 'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'sayHelloResponse/sayHelloResult' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI', + 'sayHello' => 'MyElements::sayHello', + 'sayHello/name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11' + }; +; + +sub get_class { + my $name = join '/', @{ $_[1] }; + exists $typemap_1->{ $name } or die "Cannot resolve $name via " . __PACKAGE__; + return $typemap_1->{ $name }; +} + +sub get_typemap { + return $typemap_1; +} + +1; + +__END__ + +=pod + +=head1 NAME + +MyTypemaps::HelloWorld; - typemap for ::HelloWorld; + +=head1 DESCRIPTION + +Typemap created by SOAP::WSDL for map-based SOAP message parsers. + +=cut + diff --git a/example/lib/MyTypes/test2.pm b/example/lib/MyTypes/test2.pm new file mode 100644 index 0000000..72366b8 --- /dev/null +++ b/example/lib/MyTypes/test2.pm @@ -0,0 +1,74 @@ +package MyTypes::test2; +use strict; +use warnings; +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %name_of :ATTR(:get); +my %givenName_of :ATTR(:get); + +__PACKAGE__->_factory( + [ qw( + name + givenName + ) ], + { + name => \%name_of, + givenName => \%givenName_of, + }, + { + name => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + givenName => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + } +); + +} # end BLOCK + + + + + + +1; + +=pod + +=head1 NAME + +MyTypes::test2 + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complextype +test2 from the namespace urn:HelloWorld. + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + + name + givenName + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # MyTypes::test2 + name => $some_value, # string + givenName => $some_value, # string + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/example/lib/MyTypes/testExtended.pm b/example/lib/MyTypes/testExtended.pm new file mode 100644 index 0000000..5729a8a --- /dev/null +++ b/example/lib/MyTypes/testExtended.pm @@ -0,0 +1,68 @@ +package MyTypes::testExtended; +use strict; +use warnings; +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %extend_of :ATTR(:get); + +__PACKAGE__->_factory( + [ qw( + extend + ) ], + { + extend => \%extend_of, + }, + { + extend => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + } +); + +} # end BLOCK + + + + + + +1; + +=pod + +=head1 NAME + +MyTypes::testExtended + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complextype +testExtended from the namespace urn:HelloWorld. + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + + extend + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # MyTypes::testExtended + extend => $some_value, # string + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/example/wsdl/11_helloworld.wsdl b/example/wsdl/11_helloworld.wsdl new file mode 100644 index 0000000..6a170e9 --- /dev/null +++ b/example/wsdl/11_helloworld.wsdl @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/wsdl/genericbarcode.xml b/example/wsdl/genericbarcode.xml new file mode 100644 index 0000000..6363039 --- /dev/null +++ b/example/wsdl/genericbarcode.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WebserviceX.NET barcode library that provides the means to create barcodes for printing and display in any internet enabled applications. This web service supports Code 128, Industrial 2 of 5, Interleaved 2 of 5, Code 2 5 Matrix, Code 39, Code 39 Extended, Code 93, Code 93 Extended, Codabar, EAN13, EAN8, MSI, Postnet, Supp2, Supp5, UPC A, UPC E0 and UPC E1 barcode formats. This Barcodes returns byte image. It supports following image format JPEG, GIF, PNG, BMP, EMF, EXIF, ICON, MEMORY BMP, TIFF and WMF. + + + + + + + + + + + + + + + + + + + + + + + + + + Barcode generator + + + + + + + + + + + \ No newline at end of file diff --git a/lib/SOAP/WSDL.pm b/lib/SOAP/WSDL.pm index 01a03bd..c70758f 100644 --- a/lib/SOAP/WSDL.pm +++ b/lib/SOAP/WSDL.pm @@ -1,16 +1,20 @@ package SOAP::WSDL; use strict; use warnings; + +use 5.008; # require at least perl 5.8 + use vars qw($AUTOLOAD); + use Carp; use Scalar::Util qw(blessed); use SOAP::WSDL::Client; use SOAP::WSDL::Expat::WSDLParser; -use Class::Std; +use Class::Std::Fast; use SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType; use LWP::UserAgent; -our $VERSION='2.00_17'; +our $VERSION= '2.00_25'; my %no_dispatch_of :ATTR(:name); my %wsdl_of :ATTR(:name); @@ -81,7 +85,7 @@ for my $method (keys %LOOKUP ) { sub new { my ($class, %args_from) = @_; - my $self = \do { my $foo = undef }; + my $self = \do { my $foo = Class::Std::Fast::ID() }; bless $self, $class; for (keys %args_from) { my $method = $self->can("set_$_") @@ -116,9 +120,7 @@ sub wsdlinit { # sanity checks my $types = $wsdl_definitions->first_types() or croak "unable to extract schema from WSDL"; - my $ns = $wsdl_definitions->get_xmlns() - or croak "unable to extract XML Namespaces" . $wsdl_definitions->to_string; - ( %{ $ns } ) or croak "unable to extract XML Namespaces"; + my $ns = $wsdl_definitions->get_xmlns(); # setup lookup variables $definitions_of{ $ident } = $wsdl_definitions; @@ -153,7 +155,7 @@ sub _wsdl_get_binding :PRIVATE { my $self = shift; my $ident = ident $self; my $wsdl = $definitions_of{ $ident }; - my $port = $port_of{ $ident } || $self->_wsdl_get_port(); + my $port = $self->_wsdl_get_port(); $binding_of{ $ident } = $wsdl->find_binding( $port->expand( $port->get_binding() ) ) or croak "no binding found for ", $port->get_binding(); return $binding_of{ $ident }; @@ -162,7 +164,7 @@ sub _wsdl_get_portType :PRIVATE { my $self = shift; my $ident = ident $self; my $wsdl = $definitions_of{ $ident }; - my $binding = $binding_of{ $ident } || $self->_wsdl_get_binding(); + my $binding = $self->_wsdl_get_binding(); $porttype_of{ $ident } = $wsdl->find_portType( $binding->expand( $binding->get_type() ) ) or croak "cannot find portType for " . $binding->get_type(); return $porttype_of{ $ident }; @@ -175,13 +177,11 @@ sub _wsdl_init_methods :PRIVATE { # get bindings, portType, message, part(s) - use private methods for clear separation... $self->_wsdl_get_service if not ($service_of{ $ident }); - my $binding = $binding_of{ $ident } || $self->_wsdl_get_binding() - || croak "Can't find binding"; - my $portType = $porttype_of{ $ident } || $self->_wsdl_get_portType(); + $self->_wsdl_get_portType(); $method_info_of{ $ident } = {}; - foreach my $binding_operation (@{ $binding->get_operation() }) + foreach my $binding_operation (@{ $binding_of{ $ident }->get_operation() }) { my $method = {}; @@ -193,7 +193,7 @@ sub _wsdl_init_methods :PRIVATE { # get parts # 1. get operation from port - my $operation = $portType->find_operation( $ns, + my $operation = $porttype_of{ $ident }->find_operation( $ns, $binding_operation->get_name() ); # 2. get input message name @@ -236,7 +236,7 @@ sub _wsdl_init_methods :PRIVATE { sub call { my ($self, $method, @data_from) = @_; - my $ident = ident $self; + my $ident = ${ $self }; my ($data, $header) = ref $data_from[0] ? ($data_from[0], $data_from[1] ) @@ -730,9 +730,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: WSDL.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: WSDL.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL.pm $ =cut diff --git a/lib/SOAP/WSDL/Base.pm b/lib/SOAP/WSDL/Base.pm index 02c145c..517892a 100644 --- a/lib/SOAP/WSDL/Base.pm +++ b/lib/SOAP/WSDL/Base.pm @@ -1,11 +1,11 @@ package SOAP::WSDL::Base; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use List::Util qw(first); use Carp qw(croak carp confess); -our $VERSION='2.00_17'; +our $VERSION='2.00_25'; my %id_of :ATTR(:name :default<()>); my %name_of :ATTR(:name :default<()>); @@ -91,13 +91,8 @@ sub init { { croak @args if (not defined ($value->{ Name })); if ($value->{ Name } =~m{^xmlns\:}xms) { - croak $xmlns_of{ ident $self } - if ref $xmlns_of{ ident $self } ne 'HASH'; - # add namespaces - $xmlns_of{ ident $self }->{ $value->{ Value } } = - $value->{ LocalName }; - + $xmlns_of{ ident $self }->{ $value->{ LocalName } } = $value->{ Value }; next; } elsif ($value->{ Name } =~m{^xmlns$}xms) { @@ -116,13 +111,15 @@ sub init { sub expand { my ($self, , $qname) = @_; my ($prefix, $localname) = split /:/x, $qname; - my %ns_map = reverse %{ $self->get_xmlns() }; + # my %ns_map = reverse %{ $self->get_xmlns() }; + my %ns_map = %{ $self->get_xmlns() }; return ($ns_map{ $prefix }, $localname) if ($ns_map{ $prefix }); if (my $parent = $self->get_parent()) { return $parent->expand($qname); } - confess "unbound prefix $prefix found for $prefix:$localname"; + confess "unbound prefix $prefix found for $prefix:$localname. Bound prefixes are" + . join(', ', keys %ns_map); } sub _expand; *_expand = \&expand; diff --git a/lib/SOAP/WSDL/Binding.pm b/lib/SOAP/WSDL/Binding.pm index 6d4e5b1..059456e 100644 --- a/lib/SOAP/WSDL/Binding.pm +++ b/lib/SOAP/WSDL/Binding.pm @@ -1,7 +1,7 @@ package SOAP::WSDL::Binding; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use List::Util qw(first); use base qw(SOAP::WSDL::Base); diff --git a/lib/SOAP/WSDL/Client.pm b/lib/SOAP/WSDL/Client.pm index 6853937..6b5595f 100644 --- a/lib/SOAP/WSDL/Client.pm +++ b/lib/SOAP/WSDL/Client.pm @@ -3,7 +3,7 @@ use strict; use warnings; use Carp; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use Scalar::Util qw(blessed); use SOAP::WSDL::Factory::Deserializer; @@ -11,7 +11,7 @@ use SOAP::WSDL::Factory::Serializer; use SOAP::WSDL::Factory::Transport; use SOAP::WSDL::Expat::MessageParser; -our $VERSION = '2.00_17'; +our $VERSION = '2.00_25'; my %class_resolver_of :ATTR(:name :default<()>); my %no_dispatch_of :ATTR(:name :default<()>); @@ -42,7 +42,7 @@ sub get_proxy { ## no critic RequireArgUnpacking sub set_proxy { my ($self, @args_from) = @_; - my $ident = ident $self; + my $ident = ${ $self }; # remember old value to return it later - Class::Std does so, too my $old_value = $transport_of{ $ident }; @@ -371,9 +371,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: Client.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: Client.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $ =cut diff --git a/lib/SOAP/WSDL/Client/Base.pm b/lib/SOAP/WSDL/Client/Base.pm index e5c4d4b..c18a07b 100644 --- a/lib/SOAP/WSDL/Client/Base.pm +++ b/lib/SOAP/WSDL/Client/Base.pm @@ -4,7 +4,7 @@ use warnings; use base 'SOAP::WSDL::Client'; use Scalar::Util qw(blessed); -our $VERSION = '2.00_24'; +our $VERSION = '2.00_25'; sub call { my ($self, $method, $body, $header) = @_; @@ -26,38 +26,38 @@ sub call { return $self->SUPER::call($method, $body, $header); } -sub __create_methods { - my ($package, %info_of) = @_; - - no strict qw(refs); - no warnings qw(redefine); - for my $method (keys %info_of){ - my ($soap_action, @parts); - - # up to 2.00_10 we had list refs... - if (ref $info_of{ $method }eq 'HASH') { - @parts = @{ $info_of{ $method }->{ parts } }; - $soap_action = $info_of{ $method }->{ soap_action }; - } - else { - die "Pre-v2.00_10 Interfaces are no longer supported. Please re-generate your interface."; - } - - *{ "$package\::$method" } = sub { - my $self = shift; - my @param = map { - my $data = shift || {}; - eval "require $_"; - $_->new( $data ); - } @parts; - - return $self->SUPER::call( { - operation => $method, - soap_action => $soap_action, - }, @param ); - } - } -} +#sub __create_methods { +# my ($package, %info_of) = @_; +# +# no strict qw(refs); +# no warnings qw(redefine); +# for my $method (keys %info_of){ +# my ($soap_action, @parts); +# +# # up to 2.00_10 we had list refs... +# if (ref $info_of{ $method }eq 'HASH') { +# @parts = @{ $info_of{ $method }->{ parts } }; +# $soap_action = $info_of{ $method }->{ soap_action }; +# } +# else { +# die "Pre-v2.00_10 Interfaces are no longer supported. Please re-generate your interface."; +# } +# +# *{ "$package\::$method" } = sub { +# my $self = shift; +# my @param = map { +# my $data = shift || {}; +# eval "require $_"; +# $_->new( $data ); +# } @parts; +# +# return $self->SUPER::call( { +# operation => $method, +# soap_action => $soap_action, +# }, @param ); +# } +# } +#} 1; @@ -94,9 +94,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: Base.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: Base.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client/Base.pm $ =cut diff --git a/lib/SOAP/WSDL/Definitions.pm b/lib/SOAP/WSDL/Definitions.pm index 06a9ad2..bf4bde7 100644 --- a/lib/SOAP/WSDL/Definitions.pm +++ b/lib/SOAP/WSDL/Definitions.pm @@ -6,10 +6,10 @@ use Carp; use File::Basename; use File::Path; use List::Util qw(first); -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); -our $VERSION='2.00_17'; +our $VERSION='2.00_25'; my %types_of :ATTR(:name :default<[]>); my %message_of :ATTR(:name :default<()>); @@ -118,9 +118,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: Definitions.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: Definitions.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Definitions.pm $ =cut diff --git a/lib/SOAP/WSDL/Deserializer/Hash.pm b/lib/SOAP/WSDL/Deserializer/Hash.pm index 70d28aa..342cfa4 100644 --- a/lib/SOAP/WSDL/Deserializer/Hash.pm +++ b/lib/SOAP/WSDL/Deserializer/Hash.pm @@ -1,14 +1,14 @@ package SOAP::WSDL::Deserializer::Hash; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use SOAP::WSDL::SOAP::Typelib::Fault11; use SOAP::WSDL::Expat::Message2Hash; use SOAP::WSDL::Factory::Deserializer; SOAP::WSDL::Factory::Deserializer->register( '1.1', __PACKAGE__ ); -our $VERSION='2.00_24'; +our $VERSION='2.00_25'; sub BUILD { my ($self, $ident, $args_of_ref) = @_; @@ -152,9 +152,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: Hash.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: Hash.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/Hash.pm $ =cut diff --git a/lib/SOAP/WSDL/Deserializer/XSD.pm b/lib/SOAP/WSDL/Deserializer/XSD.pm index 36cf50f..9d2e1b7 100644 --- a/lib/SOAP/WSDL/Deserializer/XSD.pm +++ b/lib/SOAP/WSDL/Deserializer/XSD.pm @@ -1,14 +1,16 @@ package SOAP::WSDL::Deserializer::XSD; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use SOAP::WSDL::SOAP::Typelib::Fault11; use SOAP::WSDL::Expat::MessageParser; -our $VERSION='2.00_24'; +our $VERSION='2.00_25'; my %class_resolver_of :ATTR(:name :default<()>); +my %parser_of :ATTR(); + sub BUILD { my ($self, $ident, $args_of_ref) = @_; @@ -16,16 +18,14 @@ sub BUILD { for (keys %{ $args_of_ref }) { delete $args_of_ref->{ $_ } if $_ ne 'class_resolver'; } - } sub deserialize { my ($self, $content) = @_; - my $parser = SOAP::WSDL::Expat::MessageParser->new({ - class_resolver => $class_resolver_of{ ident $self }, - }); - eval { $parser->parse_string( $content ) }; + $parser_of{ ${ $self } } ||= SOAP::WSDL::Expat::MessageParser->new(); + $parser_of{ ${ $self } }->class_resolver( $class_resolver_of{ ident $self } ); + eval { $parser_of{ ${ $self } }->parse_string( $content ) }; if ($@) { return $self->generate_fault({ code => 'soap:Server', @@ -34,7 +34,7 @@ sub deserialize { . "Message was: \n$content" }); } - return ( $parser->get_data(), $parser->get_header() ); + return ( $parser_of{ ${ $self } }->get_data(), $parser_of{ ${ $self } }->get_header() ); } sub generate_fault { @@ -98,9 +98,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: XSD.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: XSD.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Deserializer/XSD.pm $ =cut diff --git a/lib/SOAP/WSDL/Expat/MessageParser.pm b/lib/SOAP/WSDL/Expat/MessageParser.pm index f6f4f95..3b8852a 100644 --- a/lib/SOAP/WSDL/Expat/MessageParser.pm +++ b/lib/SOAP/WSDL/Expat/MessageParser.pm @@ -2,10 +2,19 @@ package SOAP::WSDL::Expat::MessageParser; use strict; use warnings; +use Carp qw(croak confess); + +our $VERSION = q{2.00_25}; + use SOAP::WSDL::XSD::Typelib::Builtin; +use SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType; + use base qw(SOAP::WSDL::Expat::Base); -our $VERSION = '2.00_24'; +require Class::Std::Fast; +my $OBJECT_CACHE_REF = Class::Std::Fast::OBJECT_CACHE_REF(); + +my %LOADED_OF = (); sub new { my ($class, $args) = @_; @@ -13,16 +22,41 @@ sub new { class_resolver => $args->{ class_resolver }, strict => exists $args->{ strict } ? $args->{ strict } : 1, }; + bless $self, $class; + $self->load_classes() if ($args->{ class_resolver }); return $self; } sub class_resolver { my $self = shift; - $self->{ class_resolver } = shift if @_; + if (@_) { + $self->{ class_resolver } = shift; + $self->load_classes(); + } return $self->{ 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 = $_; + + # a bad test - do you know a better one? + next if $class eq '__SKIP__'; + next if defined @{ "$class\::ISA"}; # check if namespace exists + + $class =~s{ :: }{/}xmsg; + $class .= '.pm'; + require $class; + } + $LOADED_OF{ $self->{ class_resolver } } = 1; +} + sub _initialize { my ($self, $parser) = @_; $self->{ parser } = $parser; @@ -31,13 +65,15 @@ sub _initialize { delete $self->{ header }; my $characters; - #my @characters_from = (); + + # Note: $current MUST be undef - it is used as sentinel + # on the object stack via if (! defined $list->[-1]) + # DON'T set it to anything else ! my $current = undef; - my $list = []; # node list + my $list = []; # node list (object stack) + my $path = []; # current path my $skip = 0; # skip elements - my $current_part = q{}; # are we in header or body ? - my $depth = 0; my %content_check = $self->{strict} @@ -65,28 +101,32 @@ sub _initialize { ) : (); + # use "globals" for speed + my ($_prefix, $_method, + $_class, $_leaf) = (); + my $char_handler = sub { - # push @characters_from, $_[1] if $_[1] =~m{ [^s] }xms; - $characters .= $_[1] if $_[1] =~m{ [^\s] }xms; + return if (!$_leaf); # we only want characters in leaf nodes + + $characters .= $_[1]; +# if $_[1] =~m{ [^\s] }xms; return; }; - # use "globals" for speed - my ($_prefix, $_method, - $_class) = (); - no strict qw(refs); $parser->setHandlers( Start => sub { # my ($parser, $element, %_attrs) = @_; - # $depth = $parser->depth(); + + $_leaf = 1; # believe we're a leaf node until we see an end # call methods without using their parameter stack # That's slightly faster than $content_check{ $depth }->() # and we don't have to pass $_[1] to the method. # Yup, that's dirty. - return &{$content_check{ $depth }} if exists $content_check{ $depth }; + return &{$content_check{ $depth }} + if exists $content_check{ $depth }; push @{ $path }, $_[1]; # step down in path return if $skip; # skip inside __SKIP__ @@ -102,31 +142,35 @@ sub _initialize { return; } - push @$list, $current; # step down in tree (remember current) + # step down in tree (remember current) + # + # on the first object (after skipping Envelope/Body), $current + # is undef. + # We put it on the stack, anyway, and use it as sentinel when + # going through the closing tags in the End handler + # + push @$list, $current; - $characters = q(); # empty characters + # cleanup. Mainly here to help profilers find the real hot spots + undef $current; - # Check whether we have a builtin - we implement them as classes - # We could replace this with UNIVERSAL->isa() - but it's slow... - # match is a bit faster if the string does not match, but WAY slower - # if $class matches. We hope to match often... - if (index $_class, 'SOAP::WSDL::XSD::Typelib::Builtin', 0 < 0) { - # check wheter there is a non-empty ARRAY reference for $_class::ISA - # or a "new" method - # If not, require it - all classes required here MUST - # define new() - # This is not exactly the same as $class->can('new'), but it's way faster - defined *{ "$_class\::new" }{ CODE } - or scalar @{ *{ "$_class\::ISA" }{ ARRAY } } - or eval "require $_class" ## no critic qw(ProhibitStringyEval) - or die $@; + # cleanup + $characters = q{}; + + # Create and set new objects using Class::Std::Fast's object cache + # if possible, or blessing directly into the class in question + # (circumventing constructor) here. + # That's dirty, but fast. + # + # The alternative would read: + # $current = $_class->new({ @_[2..$#_] }); + # + $current = pop @{ $OBJECT_CACHE_REF->{ $_class } }; + if (not defined $current) { + my $o = Class::Std::Fast::ID(); + $current = bless \$o, $_class; } - $current = $_class->new({ @_[2..$#_] }); # set new current object - - # remember top level element - exists $self->{ data } - or ($self->{ data } = $current); $depth++; return; }, @@ -134,8 +178,10 @@ sub _initialize { Char => $char_handler, End => sub { + pop @{ $path }; # step up in path + # check __SKIP__ if ($skip) { return if $skip ne join '/', @{ $path }, $_[1]; $skip = 0; @@ -145,30 +191,38 @@ sub _initialize { $depth--; - # This one easily handles ignores for us, too... - return if not ref $list->[-1]; + # return if there's only one elment - can't set it in parent ;-) + # but set as root element if we don't have one already. + if (not defined $list->[-1]) { + $self->{ data } = $current if (not exists $self->{ data }); + return; + }; - # set characters in current if we are a simple type - # we may have characters in complexTypes with simpleContent, - # too - maybe we should rely on the presence of characters ? - # may get a speedup by defining a ident method in anySimpleType - # and looking it up via exists &$class::ident; -# if ( $current->isa('SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType') ) { -# $current->set_value( $characters ); -# } - # currently doesn't work, as anyType does not implement value - - # maybe change ? - $current->set_value( $characters ) if (length $characters); - #$current->set_value( join @characters_from ) if (@characters_from); + # we only set character values in leaf nodes + if ($_leaf) { + # Use dirty but fast access via global variables. + # + # The normal way (via method) would be this: + # + # $current->set_value( $characters ) if (length($characters)); + # + $SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType::___value + ->{ $$current } = $characters if $characters =~m{ [^\s] }xms; + } + + # empty characters $characters = q{}; -# undef @characters_from; + # set appropriate attribute in last element # multiple values must be implemented in base class - #$_method = "add_$_localname"; + # $_method = "add_$_localname"; $_method = "add_$_[1]"; $list->[-1]->$_method( $current ); - $current = pop @$list; # step up in object hierarchy... + $current = pop @$list; # step up in object hierarchy + + $_leaf = 0; # stop believing we're a leaf node + return; } ); @@ -206,7 +260,8 @@ See L for details. Sometimes there's unneccessary information transported in SOAP messages. To skip XML nodes (including all child nodes), just edit the type map for -the message and set the type map entry to '__SKIP__'. +the message, set the type map entry to '__SKIP__', and comment out all +child elements you want to skip. =head1 Bugs and Limitations @@ -220,22 +275,23 @@ the message and set the type map entry to '__SKIP__'. =back -=head1 LICENSE AND COPYRIGHT - -Copyright 2004-2007 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 Emartin.kutter fen-net.deE +Replace the whitespace by @ for E-Mail Address. -=head1 REPOSITORY INFORMATION + Martin Kutter Emartin.kutter fen-net.deE - $Rev: 391 $ +=head1 COPYING + +This module may be used under the same terms as perl itself. + +=head1 Repository information + + $ID: $ + + $LastChangedDate: 2007-12-02 23:20:24 +0100 (So, 02 Dez 2007) $ + $LastChangedRevision: 427 $ $LastChangedBy: kutterma $ - $Id: MessageParser.pm 391 2007-11-17 21:56:13Z kutterma $ + $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageParser.pm $ -=cut \ No newline at end of file diff --git a/lib/SOAP/WSDL/Expat/WSDLParser.pm b/lib/SOAP/WSDL/Expat/WSDLParser.pm index 4d172c0..5e45ae8 100644 --- a/lib/SOAP/WSDL/Expat/WSDLParser.pm +++ b/lib/SOAP/WSDL/Expat/WSDLParser.pm @@ -5,6 +5,8 @@ use Carp; use SOAP::WSDL::TypeLookup; use base qw(SOAP::WSDL::Expat::Base); +our $VERSION = q{2.00_25}; + sub _initialize { my ($self, $parser) = @_; diff --git a/lib/SOAP/WSDL/Factory/Transport.pm b/lib/SOAP/WSDL/Factory/Transport.pm index 48f27db..cf59618 100644 --- a/lib/SOAP/WSDL/Factory/Transport.pm +++ b/lib/SOAP/WSDL/Factory/Transport.pm @@ -2,7 +2,7 @@ package SOAP::WSDL::Factory::Transport; use strict; use warnings; -our $VERSION='2.00_17'; +our $VERSION='2.00_25'; # class data my %registered_transport_of = (); @@ -27,7 +27,7 @@ my %SOAP_WSDL_TRANSPORT_OF = ( # class methods only sub register { my ($class, $scheme, $package) = @_; - die "cannot use reference as scheme" if ref $scheme; + die "Cannot use reference as scheme" if ref $scheme; $registered_transport_of{ $scheme } = $package; } @@ -236,9 +236,9 @@ Martin Kutter Emartin.kutter fen-net.deE =head1 REPOSITORY INFORMATION - $Rev: 391 $ + $Rev: 427 $ $LastChangedBy: kutterma $ - $Id: Transport.pm 391 2007-11-17 21:56:13Z kutterma $ + $Id: Transport.pm 427 2007-12-02 22:20:24Z kutterma $ $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Transport.pm $ =cut diff --git a/lib/SOAP/WSDL/Generator/Template.pm b/lib/SOAP/WSDL/Generator/Template.pm index 478cb8f..d0e30bb 100644 --- a/lib/SOAP/WSDL/Generator/Template.pm +++ b/lib/SOAP/WSDL/Generator/Template.pm @@ -1,12 +1,13 @@ package SOAP::WSDL::Generator::Template; use strict; use Template; -use Class::Std::Storable; +use Class::Std::Fast::Storable; -our $VERSION='2.00_17'; +our $VERSION=q{2.00_25}; my %tt_of :ATTR(:get); my %definitions_of :ATTR(:name :default<()>); +my %server_prefix_of :ATTR(:name :default); my %interface_prefix_of :ATTR(:name :default); my %typemap_prefix_of :ATTR(:name :default); my %type_prefix_of :ATTR(:name :default); @@ -23,17 +24,21 @@ sub START { sub _process :PROTECTED { my ($self, $template, $arg_ref, $output) = @_; my $ident = ident $self; - my $tt = $tt_of{$ident} ||= Template->new( + + $tt_of{$ident} = Template->new( DEBUG => 1, EVAL_PERL => $EVAL_PERL_of{ $ident }, RECURSION => $RECURSION_of{ $ident }, INCLUDE_PATH => $INCLUDE_PATH_of{ $ident }, OUTPUT_PATH => $OUTPUT_PATH_of{ $ident }, - ); - $tt->process( $template, + ) + if (not $tt_of{ $ident }); + + $tt_of{ $ident }->process( $template, { 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, @@ -42,7 +47,7 @@ sub _process :PROTECTED { %{ $arg_ref } }, $output) - or die $INCLUDE_PATH_of{ $ident }, '\\', $template, ' ', $tt->error(); + or die $INCLUDE_PATH_of{ $ident }, '\\', $template, ' ', $tt_of{ $ident }->error(); } 1; \ No newline at end of file diff --git a/lib/SOAP/WSDL/Generator/Template/XSD.pm b/lib/SOAP/WSDL/Generator/Template/XSD.pm index 7ebc725..d447651 100644 --- a/lib/SOAP/WSDL/Generator/Template/XSD.pm +++ b/lib/SOAP/WSDL/Generator/Template/XSD.pm @@ -1,10 +1,12 @@ package SOAP::WSDL::Generator::Template::XSD; use strict; use Template; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use File::Basename; use File::Spec; +our $VERSION = q{2.00_25}; + use SOAP::WSDL::Generator::Visitor::Typemap; use SOAP::WSDL::Generator::Visitor::Typelib; use base qw(SOAP::WSDL::Generator::Template); @@ -32,7 +34,7 @@ sub BUILD { ); $dir = File::Spec->catdir($dir, $file, 'XSD'); # return path put together... - my $path = File::Spec->catpath( $volume, $dir ); + my $path = File::Spec->catpath( $volume, $dir , q{}); # Fixup path for windows - / works fine, \ does # not... @@ -48,7 +50,7 @@ sub generate { my $self = shift; my $opt = shift; $self->generate_typelib( $opt ); - $self->generate_interface( $opt ); +# $self->generate_interface( $opt ); $self->generate_typemap( $opt ); } @@ -63,11 +65,42 @@ sub generate_typelib { return; } +sub generate_server { + my $self = shift; + my $ident = ident $self; + my $arg_ref = shift; + for my $service (@{ $self->get_definitions->get_service }) { + for my $port (@{ $service->get_port() }) { + # Skip ports without (known) address + next if not $port->first_address; + next if not $port->first_address->isa('SOAP::WSDL::SOAP::Address'); + + my $port_name = $port->get_name; + $port_name =~s{ \A .+\. }{}xms; + my $output = $arg_ref->{ output } + ? $arg_ref->{ output } + : $self->_generate_filename( + $self->get_server_prefix(), + $service->get_name(), + $port_name, + ); + print "Creating interface class $output\n"; + + $self->_process('Server.tt', + { + service => $service, + port => $port, + NO_POD => $arg_ref->{ NO_POD } ? 1 : 0 , + }, + $output, binmode => ':utf8'); + } + } +} + sub generate_interface { my $self = shift; my $ident = ident $self; my $arg_ref = shift; - my $tt = $self->get_tt(); for my $service (@{ $self->get_definitions->get_service }) { for my $port (@{ $service->get_port() }) { # Skip ports without (known) address @@ -105,7 +138,7 @@ sub generate_typemap { typemap => { 'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11', 'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI', - 'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::TOKEN', + 'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token', 'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', 'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', %{ $typemap_of{ident $self }}, diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt index dbd835a..e2ccb06 100644 --- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt @@ -1,7 +1,7 @@ package [% interface_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('^.+\.','') %]; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use Scalar::Util qw(blessed); use base qw(SOAP::WSDL::Client::Base); diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Server.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Server.tt new file mode 100644 index 0000000..8d05f4e --- /dev/null +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server.tt @@ -0,0 +1,97 @@ +package [% server_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('^.+\.','') %]; +use strict; +use warnings; +use Class::Std::Fast::Storable; +use Scalar::Util qw(blessed); +use base qw(SOAP::WSDL::Client::Base); + +# only load if it hasn't been loaded before +require [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %] + if not [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]->can('get_class'); + +my %transport_class_of :ATTR(:name :default); +my %transport_of :ATTR(:name :default<()>); +my %dispatch_to :ATTR(:name); + +my $action_map_ref = { +[% binding = definitions.find_binding( port.expand( port.get_binding ) ); + FOREACH operation = binding.get_operation; +- %] + '[% operation.first_operation.get_soapAction %]' => '[% operation.get_name %]', +[% END %] +}; + +sub START { + my ($self, $ident, $arg_ref) = @_; + eval "require $transport_class_of{ $ident }" + or die "Cannot load transport class $transport_class_of{ $ident }: $@"; + $transport_of{ $ident } = $transport_class_of{ $ident }->new({ + action_map_ref => $action_map_ref, + class_resolver => '[% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]', + dispatch_to => $dispatch_to{ $ident }, + }); +} + +sub handle { + $transport_of{ ${ $_[0] } }->handle(); +} + +1; + +[% IF NO_POD; STOP; END %] + +__END__ + +=pod + +=head1 NAME + +[% interface_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('\.', '::') %] - SOAP Server Class for the [% service.get_name %] Web Service + +=head1 SYNOPSIS + + use [% server_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('\.', '::') %]; + my $server = [% server_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('\.', '::') %]->new({ + dispatch_to => 'My::Handler::Class', + transport_class => 'SOAP::WSDL::Server::CGI', # optional, default + }); + $server->handle(); + + +=head1 DESCRIPTION + +SOAP Server handler for the [% service.get_name %] web service +located at [% port.first_address.get_location %]. + +=head1 SERVICE [% service.get_name %] + +[% service.get_documentation %] + +=head2 Port [% port.get_name %] + +[% port.get_documentation %] + +=head1 METHODS + +=head2 General methods + +=head3 new + +Constructor. + +The C argument is mandatory. It must be a class or object +implementing the SOAP Service methods listed below. + +=head2 SOAP Service methods + +[% INCLUDE Server/POD/method_info.tt %] + +[% FOREACH operation = binding.get_operation; +%][% INCLUDE Server/POD/Operation.tt %] +[% END %] + +=head1 AUTHOR + +Generated by SOAP::WSDL on [% PERL %]print scalar localtime() [% END %] + +=pod \ No newline at end of file diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Message.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Message.tt new file mode 100644 index 0000000..02ba6ef --- /dev/null +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Message.tt @@ -0,0 +1,9 @@ +[% + message_name = port_op.first_output.get_message(); + # message_name; + + part_from = definitions.find_message( port_op.first_output.expand( message_name ) ).get_part; + FOREACH part = part_from; + INCLUDE Server/POD/OutPart.tt(part = part); + END; +%] \ No newline at end of file diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt new file mode 100644 index 0000000..a1bff2c --- /dev/null +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt @@ -0,0 +1,15 @@ +=head3 [% operation.get_name %] + +[% type = definitions.find_portType( binding.expand( binding.get_type ) ); + port_op = type.find_operation( definitions.get_targetNamespace, operation.get_name ); +port_op.get_documentation %] + + sub [% operation.get_name %]( + my ($self, $body, $header) = @_; + # body is a ??? object - sorry, POD not implemented yet + # header is a ??? object - sorry, POD not implemented yet + + # do something with body and header... + + return [% INCLUDE Server/POD/Message.tt %] + } diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt new file mode 100644 index 0000000..07b3f8f --- /dev/null +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt @@ -0,0 +1,10 @@ +[% element = definitions.first_types.find_element( part.expand( part.get_element ) ); + #element.get_name(); + #element; + #STOP; +-%] + [% element_prefix %]::[% element.get_name.replace('\.', '::') %]->new([% + type = element.first_complexType || element.first_simpleType || definitions.first_types.find_type( + element.expand( element.get_type ) ); + INCLUDE Interface/POD/Type.tt; %] + ); diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/method_info.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/method_info.tt new file mode 100644 index 0000000..6561e42 --- /dev/null +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Server/POD/method_info.tt @@ -0,0 +1,4 @@ +Your dispatch_to class has to implement the following methods: + +The examples below serve as copy-and-paste prototypes to use in your +class. \ No newline at end of file diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt index 7d35836..8595d1f 100644 --- a/lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt +++ b/lib/SOAP/WSDL/Generator/Template/XSD/Typemap.tt @@ -10,6 +10,10 @@ sub get_class { return $typemap_1->{ $name }; } +sub get_typemap { + return $typemap_1; +} + 1; __END__ diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt index 8ddae94..7ae32a9 100644 --- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt +++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt @@ -1,6 +1,8 @@ -use Class::Std::Storable; +use Class::Std::Fast::Storable constructor => 'none'; use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); +Class::Std::initialize(); + { # BLOCK to scope variables [% atomic_types = {}; diff --git a/lib/SOAP/WSDL/Generator/Visitor.pm b/lib/SOAP/WSDL/Generator/Visitor.pm index 46e2862..bf6d8ba 100644 --- a/lib/SOAP/WSDL/Generator/Visitor.pm +++ b/lib/SOAP/WSDL/Generator/Visitor.pm @@ -1,9 +1,9 @@ package SOAP::WSDL::Generator::Visitor; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; -our $VERSION = '2.00_17'; +our $VERSION = q{2.00_25}; my %definitions_of :ATTR(:name :default<()>); my %type_prefix_of :ATTR(:name :default<()>); diff --git a/lib/SOAP/WSDL/Generator/Visitor/Typemap.pm b/lib/SOAP/WSDL/Generator/Visitor/Typemap.pm index 24d7085..e066661 100644 --- a/lib/SOAP/WSDL/Generator/Visitor/Typemap.pm +++ b/lib/SOAP/WSDL/Generator/Visitor/Typemap.pm @@ -1,10 +1,12 @@ package SOAP::WSDL::Generator::Visitor::Typemap; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Generator::Visitor); +our $VERSION = q{2.00_25}; + my %path_of :ATTR(:name :default<[]>); my %typemap_of :ATTR(:name :default<()>); my %type_prefix_of :ATTR(:name :default<()>); @@ -18,6 +20,7 @@ sub START { sub set_typemap_entry { my ($self, $value) = @_; + # warn join( q{/}, @{ $path_of{ ident $self } }) . " => $value"; $typemap_of{ ident $self }->{ join( q{/}, @{ $path_of{ ident $self } } ) } = $value; @@ -145,16 +148,21 @@ sub process_referenced_type { # get type's class name # Caveat: visits type if it's a referenced type from the # a ? b : c operation. - my $typeclass = - ( $ns eq 'http://www.w3.org/2001/XMLSchema' ) - ? "SOAP::WSDL::XSD::Typelib::Builtin::$localname" - : do { - my $type = - $self->get_definitions()->first_types()->find_type( $ns, $localname ); - $type->_accept($self); - join( q{::}, $type_prefix_of{$ident}, $type->get_name() ); - }; + my ($type, $typeclass); + if ( $ns eq 'http://www.w3.org/2001/XMLSchema' ) { + $typeclass = "SOAP::WSDL::XSD::Typelib::Builtin::$localname"; + } + 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); + + # set afterwards again (just to be sure...) $self->set_typemap_entry($typeclass); return $self; } @@ -171,8 +179,10 @@ sub process_atomic_type { sub visit_XSD_Element { my ( $self, $ident, $element ) = ( $_[0], ident $_[0], $_[1] ); - # TODO: what about element ref="" ? - # when we're hopping from one element to the next one... + # warn "simpleType " . $element->get_name(); + my @path = @{ $path_of{ ${ $self } } }; + my $path = join '/', @path; + my $parent = $typemap_of{ ${ $self } }->{ $path }; # step down in tree $self->add_element_path( $element ); @@ -181,25 +191,43 @@ sub visit_XSD_Element { # They all just return if no argument is given, # and return $self on success. SWITCH: { - if ($element->get_type) { - $self->process_referenced_type( $element->expand( $element->get_type() ) ) + if ($element->get_type) { + $self->process_referenced_type( $element->expand( $element->get_type() ) ) && last; } - # for atomic simple and comples types , and ref elements + + # atomic simpleType typemap rule: + # if we have a parent, use parent's sub-package. + # if not, use element package. + if ($element->get_simpleType()) { + # warn "simpleType " . $element->get_name(); + my @path = @{ $path_of{ ${ $self } } }; + my $typeclass = defined ($parent) + ? join '::_', $parent , $element->get_name() + : join q{::}, $element_prefix_of{$ident}, $element->get_name(); + $self->set_typemap_entry($typeclass); + last SWITCH; + } + + # for atomic and complex types , and ref elements my $typeclass = join q{::}, $element_prefix_of{$ident}, $element->get_name(); - $self->set_typemap_entry($typeclass); - # kind of double-dispatch: returns true on success, but does nothing - $self->process_atomic_type( $element->first_simpleType() ) - && last; - $self->process_atomic_type( $element->first_complexType() , sub { $_[1]->_accept($_[0]) } ) && last; # TODO: add element ref handling }; + + # Safety measure. If someone defines a top-level element with + # 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(); + $self->set_typemap_entry($typeclass); + } + # step up in hierarchy pop @{ $path_of{$ident} }; } diff --git a/lib/SOAP/WSDL/Message.pm b/lib/SOAP/WSDL/Message.pm index 64f6cb8..c9b5899 100644 --- a/lib/SOAP/WSDL/Message.pm +++ b/lib/SOAP/WSDL/Message.pm @@ -1,7 +1,7 @@ package SOAP::WSDL::Message; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); my %part_of :ATTR(:name :default<[]>); diff --git a/lib/SOAP/WSDL/OpMessage.pm b/lib/SOAP/WSDL/OpMessage.pm index dd61d63..65caea0 100644 --- a/lib/SOAP/WSDL/OpMessage.pm +++ b/lib/SOAP/WSDL/OpMessage.pm @@ -1,7 +1,7 @@ package SOAP::WSDL::OpMessage; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); my %body_of :ATTR(:name :default<[]>); diff --git a/lib/SOAP/WSDL/Operation.pm b/lib/SOAP/WSDL/Operation.pm index accd994..6895b78 100644 --- a/lib/SOAP/WSDL/Operation.pm +++ b/lib/SOAP/WSDL/Operation.pm @@ -1,7 +1,7 @@ package SOAP::WSDL::Operation; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); my %operation_of :ATTR(:name :default<()>); diff --git a/lib/SOAP/WSDL/Part.pm b/lib/SOAP/WSDL/Part.pm index 82396bd..12aefb7 100644 --- a/lib/SOAP/WSDL/Part.pm +++ b/lib/SOAP/WSDL/Part.pm @@ -2,7 +2,7 @@ package SOAP::WSDL::Part; use strict; use warnings; use Carp qw(croak); -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); @@ -16,7 +16,7 @@ sub serialize my $data = shift; my $opt = shift; my $typelib = $opt->{ typelib } || die "No typelib"; - my %ns_map = reverse %{ $opt->{ namespace } }; + my %ns_map = %{ $opt->{ namespace } }; my $item_name; if ($item_name = $self->get_type() ) { diff --git a/lib/SOAP/WSDL/Port.pm b/lib/SOAP/WSDL/Port.pm index 40a7492..37fd3bf 100644 --- a/lib/SOAP/WSDL/Port.pm +++ b/lib/SOAP/WSDL/Port.pm @@ -1,7 +1,7 @@ package SOAP::WSDL::Port; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); my %binding_of :ATTR(:name :default<()>); diff --git a/lib/SOAP/WSDL/PortType.pm b/lib/SOAP/WSDL/PortType.pm index aa3c1f8..b3d6ab0 100644 --- a/lib/SOAP/WSDL/PortType.pm +++ b/lib/SOAP/WSDL/PortType.pm @@ -1,7 +1,7 @@ package SOAP::WSDL::PortType; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); my %operation_of :ATTR(:name :default<()>); diff --git a/lib/SOAP/WSDL/SOAP/Address.pm b/lib/SOAP/WSDL/SOAP/Address.pm index 3685f1c..f31055e 100644 --- a/lib/SOAP/WSDL/SOAP/Address.pm +++ b/lib/SOAP/WSDL/SOAP/Address.pm @@ -1,9 +1,7 @@ package SOAP::WSDL::SOAP::Address; use strict; use warnings; -use Class::Std::Storable; use base qw(SOAP::WSDL::Base); - - +use Class::Std::Fast::Storable; my %location :ATTR(:name :default<()>); 1; \ No newline at end of file diff --git a/lib/SOAP/WSDL/SOAP/Body.pm b/lib/SOAP/WSDL/SOAP/Body.pm index 26437e7..84b64ed 100644 --- a/lib/SOAP/WSDL/SOAP/Body.pm +++ b/lib/SOAP/WSDL/SOAP/Body.pm @@ -2,7 +2,7 @@ package SOAP::WSDL::SOAP::Body; use strict; use warnings; use base qw(SOAP::WSDL::Base); - +use Class::Std::Fast::Storable; my %use_of :ATTR(:name :default); my %namespace_of :ATTR(:name :default); my %encodingStyle_of :ATTR(:name :default); diff --git a/lib/SOAP/WSDL/SOAP/Header.pm b/lib/SOAP/WSDL/SOAP/Header.pm index 17aed82..e4df549 100644 --- a/lib/SOAP/WSDL/SOAP/Header.pm +++ b/lib/SOAP/WSDL/SOAP/Header.pm @@ -2,7 +2,7 @@ package SOAP::WSDL::SOAP::Header; use strict; use warnings; use base qw(SOAP::WSDL::Base); - +use Class::Std::Fast::Storable; my %use_of :ATTR(:name :default); my %namespace_of :ATTR(:name :default); my %encodingStyle_of :ATTR(:name :default); diff --git a/lib/SOAP/WSDL/SOAP/Operation.pm b/lib/SOAP/WSDL/SOAP/Operation.pm index bb34d4d..a2b27f3 100644 --- a/lib/SOAP/WSDL/SOAP/Operation.pm +++ b/lib/SOAP/WSDL/SOAP/Operation.pm @@ -1,10 +1,10 @@ package SOAP::WSDL::SOAP::Operation; use strict; use warnings; -use Class::Std::Storable; +use Class::Std::Fast::Storable; use base qw(SOAP::WSDL::Base); -our $VERSION='2.00_17'; +our $VERSION=q{2.00_25}; my %style_of :ATTR(:name