r2002 - in packages/soap-lite/branches/upstream/current: . examples/COM lib/SOAP

[Krzysztof Krzyzaniak]

Author: eloy
Date: 2006-01-19 15:02:30 +0000 (Thu, 19 Jan 2006)
New Revision: 2002

Modified:
   packages/soap-lite/branches/upstream/current/META.yml
   packages/soap-lite/branches/upstream/current/examples/COM/make-com-minimal.bat
   packages/soap-lite/branches/upstream/current/examples/COM/make-com-standalone.bat
   packages/soap-lite/branches/upstream/current/lib/SOAP/Lite.pm
Log:
Load /tmp/tmp.ktDvVa/soap-lite-0.66.1 into
packages/soap-lite/branches/upstream/current.


Modified: packages/soap-lite/branches/upstream/current/META.yml
===================================================================
--- packages/soap-lite/branches/upstream/current/META.yml	2006-01-19 09:46:10 UTC (rev 2001)
+++ packages/soap-lite/branches/upstream/current/META.yml	2006-01-19 15:02:30 UTC (rev 2002)
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         SOAP-Lite
-version:      0.66
+version:      0.66.1
 version_from: lib/SOAP/Lite.pm
 installdirs:  site
 requires:


Property changes on: packages/soap-lite/branches/upstream/current/examples/COM/make-com-minimal.bat
___________________________________________________________________
Name: svn:executable
   - 
   + *


Property changes on: packages/soap-lite/branches/upstream/current/examples/COM/make-com-standalone.bat
___________________________________________________________________
Name: svn:executable
   - 
   + *

Modified: packages/soap-lite/branches/upstream/current/lib/SOAP/Lite.pm
===================================================================
--- packages/soap-lite/branches/upstream/current/lib/SOAP/Lite.pm	2006-01-19 09:46:10 UTC (rev 2001)
+++ packages/soap-lite/branches/upstream/current/lib/SOAP/Lite.pm	2006-01-19 15:02:30 UTC (rev 2002)
@@ -4,7 +4,7 @@
 # SOAP::Lite is free software; you can redistribute it
 # and/or modify it under the same terms as Perl itself.
 #
-# $Id: Lite.pm,v 1.37 2005/12/25 07:52:18 byrnereese Exp $
+# $Id: Lite.pm,v 1.38 2006/01/04 23:01:06 byrnereese Exp $
 #
 # ======================================================================
 
@@ -15,7 +15,7 @@
 use vars qw($VERSION);
 #$VERSION = sprintf("%d.%s", map {s/_//g; $_} q$Name:  $ =~ /-(\d+)_([\d_]+)/)
 #  or warn "warning: unspecified/non-released version of ", __PACKAGE__, "\n";
-$VERSION = '0.66';
+$VERSION = '0.66.1';
 
 # ======================================================================
 
@@ -855,7 +855,7 @@
 
 sub use_prefix {
   my $self = shift->new;
-  warn 'use_prefix has been deprecated. if you wish to turn off or on the use of a default namespace, then please use either ns(uri) or default_ns(uri)';
+#  warn 'use_prefix has been deprecated. if you wish to turn off or on the use of a default namespace, then please use either ns(uri) or default_ns(uri)';
   if (@_) {
       my $use = shift;
       $self->{'_use_default_ns'} = !$use;
@@ -1446,8 +1446,19 @@
     } elsif (UNIVERSAL::isa($method => 'SOAP::Data')) {
       $body = $method;
     } elsif (!$self->use_default_ns) {
-      $body = SOAP::Data->name($method)->uri($self->{'_ns_uri'});
-      $body = $body->prefix($self->{'_ns_prefix'}) if ($self->{'_ns_prefix'});
+
+# Commented out by Byrne on 1/4/2006 - to address default namespace problems
+#      $body = SOAP::Data->name($method)->uri($self->{'_ns_uri'});
+#      $body = $body->prefix($self->{'_ns_prefix'}) if ($self->{'_ns_prefix'});
+
+# Added by Byrne on 1/4/2006 - to avoid the unnecessary creation of a new
+# namespace
+# Begin New Code (replaces code commented out above)
+      $body = SOAP::Data->name($method);
+      my $pre = $self->find_prefix($self->{'_ns_uri'});
+      $body = $body->prefix($pre) if ($self->{'_ns_prefix'});
+# End new code
+
     } else {
       if ($self->{'_ns_uri'}) {
         $body = SOAP::Data->name($method)->attr( { 
@@ -2821,7 +2832,7 @@
 	    for ($services{$opername}) {
 		$_->{endpoint}   = $endpoint;
 		$_->{soapaction} = $soapaction;
-		$_->{uri}        = $namespace;
+		$_->{namespace}  = $namespace;
 #		$_->{parameters} = [@parts];
 	    }
 	    
@@ -2948,14 +2959,14 @@
   $self->{'_stub'} = <<"EOP";
 package $package;
 # Generated by SOAP::Lite (v$SOAP::Lite::VERSION) for Perl -- soaplite.com
-# Copyright (C) 2000-2004 Paul Kulchenko
+# Copyright (C) 2000-2006 Paul Kulchenko, Byrne Reese
 # -- generated at [@{[scalar localtime]}]
 EOP
   $self->{'_stub'} .= "# -- generated from $schema_url\n" if $schema_url;
   $self->{'_stub'} .= 'my %methods = ('."\n";
   foreach my $service (keys %$services) {
     $self->{'_stub'} .= "$service => {\n";
-    foreach (qw(endpoint soapaction uri)) {
+    foreach (qw(endpoint soapaction namespace)) {
       $self->{'_stub'} .= "    $_ => '".$services->{$service}{$_}."',\n";
     }
     $self->{'_stub'} .= "    parameters => [\n";
@@ -3005,7 +3016,7 @@
     }
   }
   $self->endpoint($method{endpoint})
-       ->uri($method{uri})
+       ->ns($method{namespace})
        ->on_action(sub{qq!"$method{soapaction}"!});
 EOP
   my $namespaces = $self->deserializer->ids->[1];