Menu
▾
▴
[Pywebsvcs-checkins] SF.net SVN: pywebsvcs: [1314] trunk/zsi
|
From: <bov...@us...> - 2007-01-03 23:43:04
|
Revision: 1314
http://svn.sourceforge.net/pywebsvcs/?rev=1314&view=rev
Author: boverhof
Date: 2007-01-03 15:43:01 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
M test/wsdl2py/test_Choice.py
M test/wsdl2py/test_AmazonS3.py
M test/wsdl2py/test_AWSECommerceService.py
M test/wsdl2py/test_Sabre.py
M test/wsdl2py/config.txt
M test/wsdl2py/test_DateService.py
M test/wsdl2py/ServiceTest.py
M test/wsdl2py/servers/DateService.py
M test/wsdl2py/servers/SquareService.py
M test/wsdl2py/servers/EchoServer.py
M test/wsdl2py/servers/FinancialService.py
M test/wsdl2py/servers/WhiteMesa.py
M test/wsdl2py/test_FinancialService.py
M test/wsdl2py/test_DerivedTypes.py
M test/wsdl2py/test_ThreatService.py
M test/wsdl2py/test_OpcDaGateway.py
M test/wsdl2py/test_Echo.py
M test/wsdl2py/test_ZipCodeResolver.py
M test/wsdl2py/test_XMethodsQuery.py
M test/wsdl2py/test_SquareService.py
M test/wsdl2py/test_InfoBil.py
M test/wsdl2py/test_WhiteMesa.py
M test/wsdl2py/test_Attributes.py
M test/wsdl2py/test_MapPoint.py
M setup.py
M doc/guide02-wsdl2py.tex
M CHANGES
-- update wsdl2py test code, simplified generated module names
Modified Paths:
--------------
trunk/zsi/CHANGES
trunk/zsi/doc/guide02-wsdl2py.tex
trunk/zsi/setup.py
trunk/zsi/test/wsdl2py/ServiceTest.py
trunk/zsi/test/wsdl2py/config.txt
trunk/zsi/test/wsdl2py/servers/DateService.py
trunk/zsi/test/wsdl2py/servers/EchoServer.py
trunk/zsi/test/wsdl2py/servers/FinancialService.py
trunk/zsi/test/wsdl2py/servers/SquareService.py
trunk/zsi/test/wsdl2py/servers/WhiteMesa.py
trunk/zsi/test/wsdl2py/test_AWSECommerceService.py
trunk/zsi/test/wsdl2py/test_AmazonS3.py
trunk/zsi/test/wsdl2py/test_Attributes.py
trunk/zsi/test/wsdl2py/test_Choice.py
trunk/zsi/test/wsdl2py/test_DateService.py
trunk/zsi/test/wsdl2py/test_DerivedTypes.py
trunk/zsi/test/wsdl2py/test_Echo.py
trunk/zsi/test/wsdl2py/test_FinancialService.py
trunk/zsi/test/wsdl2py/test_InfoBil.py
trunk/zsi/test/wsdl2py/test_MapPoint.py
trunk/zsi/test/wsdl2py/test_OpcDaGateway.py
trunk/zsi/test/wsdl2py/test_Sabre.py
trunk/zsi/test/wsdl2py/test_SquareService.py
trunk/zsi/test/wsdl2py/test_ThreatService.py
trunk/zsi/test/wsdl2py/test_WhiteMesa.py
trunk/zsi/test/wsdl2py/test_XMethodsQuery.py
trunk/zsi/test/wsdl2py/test_ZipCodeResolver.py
Modified: trunk/zsi/CHANGES
===================================================================
--- trunk/zsi/CHANGES 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/CHANGES 2007-01-03 23:43:01 UTC (rev 1314)
@@ -6,6 +6,11 @@
- Record facets (restrictions) in XMLSchema.py <vc...@da...>
- Remove Send()'s kwargs out of _args list <ef...@bo...>
+Change for 2.0.0 released xxx:
+ - no more wsdl2dispatch, wsdl2py does it all
+ - simplified and consolidated various wsdl2py script options
+ - wsdl2py added some soapheader support to client code.
+
Change for 2.0.0rc3 released xxx:
- Updated ZSI developers guide
- Added ZSI wsdl2py users guide
Modified: trunk/zsi/doc/guide02-wsdl2py.tex
===================================================================
--- trunk/zsi/doc/guide02-wsdl2py.tex 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/doc/guide02-wsdl2py.tex 2007-01-03 23:43:01 UTC (rev 1314)
@@ -1,27 +1,38 @@
\chapter{WSDL to Python Code}
-The \WPY script is the most used tool. It will generate all the
-code needed to access a Web Service through an exposed WSDL document, usually
-this description is available at a URL which is provided to the script.
+The \WPY script is used to generate all the code needed to access a Web Service
+through an exposed WSDL document, usually this description is available at a URL
+which is provided to the script.
-\WPY generates a "stub" module from the WSDL SOAP Bindings. It contains various
-classes, including a \it{Locator} which represents the bindings to the actual
-Web Service, and several \it{port} classes that are used to remotely invoke
-operations on the \WS, as well as various \it{Message} classes that
-represent the SOAP and XML Schema data types. A \it{Message} instance is
-serialized as a XML instance. A \it{Message} passed as an argument to a
-\it{port} method is then serialized into a SOAP Envelope and transported to the
-\WS, the client will then wait for an expected response, and finally the SOAP
-response is marshalled back into the \it{Message} returned to the user.
+\section{Generated Modules}
+\WPY will generate a client, types, and service module. From the the WSDL
+SOAP Bindings, the client and service modules are created. The types module
+contains typecodes for the schema defined by the WSDL.
-A second module the "types", contains typecodes representing all the components
-of each schema specified by the target WSDL Document (not including built-in
-types). Each schema component declared at the top-level, the immediate children
-of the \it{schema} tag, are global in scope and by importing the "types" module
-an application has access to the GEDs and global type definitions either
-directly by reference or through the convenience functions \code{GED} and
-\code{GTD}, respectively. For more information on these functions please see ..
+\subsection{CLIENT: locator, port}
+various classes, including a \it{Locator} which represents the
+SOAP binding to the actual Web Service, and several \it{port} classes that are
+used to remotely invoke operations on the \WS, as well as various \it{Message}
+classes that represent the SOAP and XML Schema data types. A \it{Message}
+instance is serialized as a XML instance. A \it{Message} passed as an argument
+to a \it{port} method is then serialized into a SOAP Envelope and transported to
+the \WS, the client will then wait for an expected response, and finally the
+SOAP response is marshalled back into the \it{Message} returned to the user.
+\subsection{TYPES: typecodes/schema}
+typecodes representing all the components of each schema specified by the target
+WSDL Document (not including built-in types). Each schema component declared at
+the top-level, the immediate children of the \it{schema} tag, are global in
+scope and by importing the "types" module an application has access to the GEDs
+and global type definitions either directly by reference or through the
+convenience functions \code{GED} and \code{GTD}, respectively. For more
+information on these functions please see ..
+
+\subsection{SERVICE: service interface/bindings}
+skeleton class, normally subclassed and invoked by implementation code. The
+skeleton defines a callback method for each operation defined in the SOAP
+\it{Binding}. These methods marshal/unmarshall XML into python types.
+
\section{wsdl2py}
\subsection{Basics of Code Generation}
Modified: trunk/zsi/setup.py
===================================================================
--- trunk/zsi/setup.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/setup.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -41,7 +41,6 @@
additional_params['entry_points'] = {
'console_scripts': [
'wsdl2py = ZSI.generate.commands:wsdl2py',
- 'wsdl2dispatch = ZSI.generate.commands:wsdl2dispatch',
],
}
additional_params['install_requires'] = [ "PyXML >= 0.8.3", ]
@@ -50,7 +49,7 @@
"http://sourceforge.net/project/showfiles.php?group_id=6473&package_id=6541&release_id=286213",
]
else:
- additional_params['scripts'] = ["scripts/wsdl2py", "scripts/wsdl2dispatch"]
+ additional_params['scripts'] = ["scripts/wsdl2py",]
setup(
name="ZSI",
Modified: trunk/zsi/test/wsdl2py/ServiceTest.py
===================================================================
--- trunk/zsi/test/wsdl2py/ServiceTest.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/ServiceTest.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -262,9 +262,9 @@
args = []
ServiceTestCase._wsdl[url] = False
if os.path.isfile(url):
- args += ['-f', os.path.abspath(url)]
+ args.append(os.path.abspath(url))
else:
- args += ['-u', url]
+ args.append(url)
try:
os.mkdir(MODULEDIR)
@@ -277,7 +277,7 @@
try:
# Client Stubs
- wsdl2py = ['wsdl2py'] + args + self.wsdl2py_args
+ wsdl2py = ['wsdl2py'] + self.wsdl2py_args + args
try:
exit = subprocess.call(wsdl2py)
except OSError, ex:
@@ -292,19 +292,19 @@
'"%s" exited with exit status: %d' %(wsdl2py, exit))
# Service Stubs
- if '-x' not in self.wsdl2py_args:
- wsdl2dispatch = (['wsdl2dispatch'] + args +
- self.wsdl2dispatch_args)
- try:
- exit = subprocess.call(wsdl2dispatch)
- except OSError, ex:
- warnings.warn("TODO: Not sure what is going on here?")
+ #if '-x' not in self.wsdl2py_args:
+ # wsdl2dispatch = (['wsdl2dispatch'] + args +
+ # self.wsdl2dispatch_args)
+ # try:
+ # exit = subprocess.call(wsdl2dispatch)
+ # except OSError, ex:
+ # warnings.warn("TODO: Not sure what is going on here?")
- #TODO: returncode WINDOWS?
- if WIF: self.failUnless(os.WIFEXITED(exit),
- '"%s" exited with signal#: %d' %(wsdl2dispatch, exit))
- self.failUnless(exit == 0,
- '"%s" exited with exit status: %d' %(wsdl2dispatch, exit))
+ # #TODO: returncode WINDOWS?
+ # if WIF: self.failUnless(os.WIFEXITED(exit),
+ # '"%s" exited with signal#: %d' %(wsdl2dispatch, exit))
+ # self.failUnless(exit == 0,
+ # '"%s" exited with exit status: %d' %(wsdl2dispatch, exit))
ServiceTestCase._wsdl[url] = True
Modified: trunk/zsi/test/wsdl2py/config.txt
===================================================================
--- trunk/zsi/test/wsdl2py/config.txt 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/config.txt 2007-01-03 23:43:01 UTC (rev 1314)
@@ -19,7 +19,7 @@
#
##########################################################################
[configuration]
-tracefile = False
+tracefile = 1
debug = False
skip = False
twisted = False
@@ -117,7 +117,7 @@
document = True
literal = True
broke = False
-tests = test_MapPoint test_OpcDaGateway test_Sabre test_Echo test_AWSECommerceService test_FinancialService
+tests = test_MapPoint test_OpcDaGateway test_Echo test_AWSECommerceService test_FinancialService
[doc_literal_broke]
document = True
@@ -162,3 +162,6 @@
test_ThreatService = http://www.boyzoid.com/threat.cfc?wsdl
test_TerraService = http://terraservice.net/TerraService.asmx?WSDL
test_InfoBil = http://javatest2.infodata.se/webservices/services/Infobil?wsdl
+
+# Google AdWords
+test_GoogleAdWords_TES = https://sandbox.google.com/api/adwords/v8/TrafficEstimatorService?wsdl
Modified: trunk/zsi/test/wsdl2py/servers/DateService.py
===================================================================
--- trunk/zsi/test/wsdl2py/servers/DateService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/servers/DateService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -5,7 +5,7 @@
###########################################################################
import sys, time
from ZSI.ServiceContainer import AsServer
-from DateService_services_server import simple_Date_Service as _DateService
+from DateService_server import simple_Date_Service as _DateService
class Service(_DateService):
def soap_getCurrentDate(self, ps):
Modified: trunk/zsi/test/wsdl2py/servers/EchoServer.py
===================================================================
--- trunk/zsi/test/wsdl2py/servers/EchoServer.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/servers/EchoServer.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -5,7 +5,7 @@
###########################################################################
import sys
from ZSI.ServiceContainer import AsServer
-from EchoServer_services_server import EchoServer
+from EchoServer_server import EchoServer
"""
EchoServer example service
Modified: trunk/zsi/test/wsdl2py/servers/FinancialService.py
===================================================================
--- trunk/zsi/test/wsdl2py/servers/FinancialService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/servers/FinancialService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -4,7 +4,7 @@
# See LBNLCopyright for copyright notice!
###########################################################################
import sys
-from FinancialService_services_server import *
+from FinancialService_server import *
from ZSI.ServiceContainer import AsServer
class Service(FinancialService):
Modified: trunk/zsi/test/wsdl2py/servers/SquareService.py
===================================================================
--- trunk/zsi/test/wsdl2py/servers/SquareService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/servers/SquareService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -4,7 +4,7 @@
# See LBNLCopyright for copyright notice!
###########################################################################
import sys
-import SquareService_services_server as Square
+import SquareService_server as Square
from ZSI.ServiceContainer import AsServer
class Service(Square.SquareService):
Modified: trunk/zsi/test/wsdl2py/servers/WhiteMesa.py
===================================================================
--- trunk/zsi/test/wsdl2py/servers/WhiteMesa.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/servers/WhiteMesa.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -5,7 +5,7 @@
###########################################################################
import sys
from ZSI.ServiceContainer import AsServer
-from RPC_Literal_TestDefinitions_services_server import WhiteMesaSoapRpcLitTestSvc as WhiteMesa
+from RPC_Literal_TestDefinitions_server import WhiteMesaSoapRpcLitTestSvc as WhiteMesa
"""
WhiteMesa web service for rpc/literal tests.
Modified: trunk/zsi/test/wsdl2py/test_AWSECommerceService.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_AWSECommerceService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_AWSECommerceService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -47,9 +47,9 @@
"""Test case for Amazon ECommerce Web service
"""
name = "test_AWSECommerceService"
- client_file_name = "AWSECommerceService_services.py"
- types_file_name = "AWSECommerceService_services_types.py"
- server_file_name = "AWSECommerceService_services_server.py"
+ client_file_name = "AWSECommerceService_client.py"
+ types_file_name = "AWSECommerceService_types.py"
+ server_file_name = "AWSECommerceService_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_AmazonS3.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_AmazonS3.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_AmazonS3.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -45,9 +45,9 @@
"""Test case for AmazonS3 web service
"""
name = "test_AmazonS3"
- client_file_name = "AmazonS3_services.py"
- types_file_name = "AmazonS3_services_types.py"
- server_file_name = "AmazonS3_services_server.py"
+ client_file_name = "AmazonS3_client.py"
+ types_file_name = "AmazonS3_types.py"
+ server_file_name = "AmazonS3_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_Attributes.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_Attributes.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_Attributes.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -45,7 +45,7 @@
class AttributeTestCase(ServiceTestCase):
name = "test_Attributes"
- types_file_name = "test_Attributes_xsd_services_types.py"
+ types_file_name = "test_Attributes_xsd_types.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_Choice.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_Choice.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_Choice.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -44,7 +44,7 @@
class ChoiceTestCase(ServiceTestCase):
name = "test_Choice"
- types_file_name = "test_Choice_xsd_services_types.py"
+ types_file_name = "test_Choice_xsd_types.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_DateService.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_DateService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_DateService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -46,9 +46,9 @@
"""Test case for Holger's DateService
"""
name = "test_DateService"
- client_file_name = "DateService_services.py"
- types_file_name = "DateService_services_types.py"
- server_file_name = "DateService_services_server.py"
+ client_file_name = "DateService_client.py"
+ types_file_name = "DateService_types.py"
+ server_file_name = "DateService_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_DerivedTypes.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_DerivedTypes.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_DerivedTypes.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -46,7 +46,7 @@
class DTTestCase(ServiceTestCase):
name = "test_DerivedTypes"
client_file_name = None
- types_file_name = "test_DerivedTypes_xsd_services_types.py"
+ types_file_name = "test_DerivedTypes_xsd_types.py"
server_file_name = None
def __init__(self, methodName):
Modified: trunk/zsi/test/wsdl2py/test_Echo.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_Echo.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_Echo.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -40,9 +40,9 @@
class EchoTestCase(ServiceTestCase):
name = "test_Echo"
- client_file_name = "EchoServer_services.py"
- types_file_name = "EchoServer_services_types.py"
- server_file_name = "EchoServer_services_server.py"
+ client_file_name = "EchoServer_client.py"
+ types_file_name = "EchoServer_types.py"
+ server_file_name = "EchoServer_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_FinancialService.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_FinancialService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_FinancialService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -48,9 +48,9 @@
"""Test case for Holger's SquareService
"""
name = "test_FinancialService"
- client_file_name = "FinancialService_services.py"
- types_file_name = "FinancialService_services_types.py"
- server_file_name = "FinancialService_services_server.py"
+ client_file_name = "FinancialService_client.py"
+ types_file_name = "FinancialService_types.py"
+ server_file_name = "FinancialService_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_InfoBil.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_InfoBil.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_InfoBil.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -40,9 +40,9 @@
class TestCase(ServiceTestCase):
name = "test_InfoBil"
- client_file_name = "InfoBilServiceService_services.py"
- types_file_name = "InfoBilServiceService_services_types.py"
- server_file_name = "InfoBilServiceService_services_server.py"
+ client_file_name = "InfoBilServiceService_client.py"
+ types_file_name = "InfoBilServiceService_types.py"
+ server_file_name = "InfoBilServiceService_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_MapPoint.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_MapPoint.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_MapPoint.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -42,9 +42,9 @@
"""
name = "test_MapPoint"
- client_file_name = "CommonService_services.py"
- types_file_name = "CommonService_services_types.py"
- server_file_name = "CommonService_services_server.py"
+ client_file_name = "CommonService_client.py"
+ types_file_name = "CommonService_types.py"
+ server_file_name = "CommonService_server.py"
def test_net_GetVersionInfo(self):
"""expect this to fail cause i'm not doing http authentication.
Modified: trunk/zsi/test/wsdl2py/test_OpcDaGateway.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_OpcDaGateway.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_OpcDaGateway.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -52,9 +52,9 @@
def Write(self, request):
"""
name = "test_OpcDaGateway"
- client_file_name = "OpcXmlDaSrv_services.py"
- types_file_name = "OpcXmlDaSrv_services_types.py"
- server_file_name = "OpcXmlDaSrv_services_server.py"
+ client_file_name = "OpcXmlDaSrv_client.py"
+ types_file_name = "OpcXmlDaSrv_types.py"
+ server_file_name = "OpcXmlDaSrv_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_Sabre.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_Sabre.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_Sabre.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -44,9 +44,9 @@
"""
name = "test_Sabre"
- client_file_name = "SessionCreateRQService_services.py"
- types_file_name = "SessionCreateRQService_services_types.py"
- server_file_name = "SessionCreateRQService_services_server.py"
+ client_file_name = "SessionCreateRQService_client.py"
+ types_file_name = "SessionCreateRQService_types.py"
+ server_file_name = "SessionCreateRQService_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_SquareService.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_SquareService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_SquareService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -48,9 +48,9 @@
"""Test case for Holger's SquareService
"""
name = "test_SquareService"
- client_file_name = "SquareService_services.py"
- types_file_name = "SquareService_services_types.py"
- server_file_name = "SquareService_services_server.py"
+ client_file_name = "SquareService_client.py"
+ types_file_name = "SquareService_types.py"
+ server_file_name = "SquareService_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_ThreatService.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_ThreatService.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_ThreatService.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -44,8 +44,8 @@
"""Test case for ZipCodeResolver Web service
"""
name = "test_ThreatService"
- client_file_name = "Current_Homeland_Security_Threat_Level_services.py"
- types_file_name = "Current_Homeland_Security_Threat_Level_services_types.py"
+ client_file_name = "Current_Homeland_Security_Threat_Level_client.py"
+ types_file_name = "Current_Homeland_Security_Threat_Level_types.py"
server_file_name = None
def __init__(self, methodName):
Modified: trunk/zsi/test/wsdl2py/test_WhiteMesa.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_WhiteMesa.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_WhiteMesa.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -43,9 +43,9 @@
"""Test case for ZipCodeResolver Web service
"""
name = "test_WhiteMesa"
- client_file_name = "RPC_Literal_TestDefinitions_services.py"
- types_file_name = "RPC_Literal_TestDefinitions_services_types.py"
- server_file_name = "RPC_Literal_TestDefinitions_services_server.py"
+ client_file_name = "RPC_Literal_TestDefinitions_client.py"
+ types_file_name = "RPC_Literal_TestDefinitions_types.py"
+ server_file_name = "RPC_Literal_TestDefinitions_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_XMethodsQuery.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_XMethodsQuery.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_XMethodsQuery.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -43,9 +43,9 @@
"""Test case for XMethodsQuery Web service
"""
name = "test_XMethodsQuery"
- client_file_name = "XMethodsQuery_services.py"
- types_file_name = "XMethodsQuery_services_types.py"
- server_file_name = "XMethodsQuery_services_server.py"
+ client_file_name = "XMethodsQuery_client.py"
+ types_file_name = "XMethodsQuery_types.py"
+ server_file_name = "XMethodsQuery_server.py"
def __init__(self, methodName):
ServiceTestCase.__init__(self, methodName)
Modified: trunk/zsi/test/wsdl2py/test_ZipCodeResolver.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_ZipCodeResolver.py 2007-01-03 23:41:45 UTC (rev 1313)
+++ trunk/zsi/test/wsdl2py/test_ZipCodeResolver.py 2007-01-03 23:43:01 UTC (rev 1314)
@@ -44,9 +44,9 @@
"""Test case for ZipCodeResolver Web service
"""
name = "test_ZipCodeResolver"
- client_file_name = "ZipCodeResolver_services.py"
- types_file_name = "ZipCodeResolver_services_types.py"
- #server_file_name = "ZipCodeResolver_services_server.py"
+ client_file_name = "ZipCodeResolver.py"
+ types_file_name = "ZipCodeResolver_types.py"
+ #server_file_name = "ZipCodeResolver_server.py"
def test_net_CorrectedAddressHtml(self):
loc = self.client_module.ZipCodeResolverLocator()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
