Menu
▾
▴
[Pywebsvcs-checkins] SF.net SVN: pywebsvcs: [1237] trunk/zsi
|
From: <cm...@us...> - 2006-06-05 23:41:08
|
Revision: 1237 Author: cmoad Date: 2006-06-05 12:47:17 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/pywebsvcs/?rev=1237&view=rev Log Message: ----------- renamed wsdl2xxx.py to wsdl2xx everywhere Modified Paths: -------------- trunk/zsi/ZSI/generate/commands.py trunk/zsi/doc/guide02-wsdl2py.tex trunk/zsi/setup.py trunk/zsi/test/wsdl2py/README trunk/zsi/test/wsdl2py/ServiceTest.py Modified: trunk/zsi/ZSI/generate/commands.py =================================================================== --- trunk/zsi/ZSI/generate/commands.py 2006-06-05 19:27:15 UTC (rev 1236) +++ trunk/zsi/ZSI/generate/commands.py 2006-06-05 19:47:17 UTC (rev 1237) @@ -76,7 +76,7 @@ # Basic options op.add_option("-f", "--file", action="store", dest="file", default=None, type="string", - help="file to load wsdl from") + help="FILE to load wsdl from") op.add_option("-u", "--url", action="store", dest="url", default=None, type="string", help="URL to load wsdl from") @@ -117,8 +117,8 @@ action="store", dest="types", default=None, type="string", help="file to load types from") op.add_option("-o", "--output-dir", - action="store", dest="output_directory", default=".", type="string", - help="file to load types from") + action="store", dest="output_dir", default=".", type="string", + help="Write generated files to OUTPUT_DIR") op.add_option("-s", "--simple-naming", action="store_true", dest="simple_naming", default=False, help="Simplify generated naming.") @@ -202,17 +202,17 @@ if options.types != None: wsm.setTypesModuleName(options.types) if options.schema is False: - fd = open(os.path.join(options.output_directory, '%s.py' %wsm.getClientModuleName()), 'w+') + fd = open(os.path.join(options.output_dir, '%s.py' %wsm.getClientModuleName()), 'w+') # simple naming writes the messages to a separate file if not options.simple_naming: wsm.writeClient(fd) else: # provide a separate file to store messages to. - msg_fd = open(os.path.join(options.output_directory, '%s.py' %wsm.getMessagesModuleName()), 'w+') + msg_fd = open(os.path.join(options.output_dir, '%s.py' %wsm.getMessagesModuleName()), 'w+') wsm.writeClient(fd, msg_fd=msg_fd) msg_fd.close() fd.close() - fd = open( os.path.join(options.output_directory, '%s.py' %wsm.getTypesModuleName()), 'w+') + fd = open( os.path.join(options.output_dir, '%s.py' %wsm.getTypesModuleName()), 'w+') wsm.writeTypes(fd) fd.close() @@ -243,9 +243,9 @@ help="debug output") op.add_option("-t", "--types", action="store", dest="types", default=None, type="string", - help="file to load types from") + help="Write generated files to OUTPUT_DIR") op.add_option("-o", "--output-dir", - action="store", dest="output_directory", default=".", type="string", + action="store", dest="output_dir", default=".", type="string", help="file to load types from") op.add_option("-s", "--simple-naming", action="store_true", dest="simple_naming", default=False, @@ -285,6 +285,6 @@ ss = ServiceDescription(do_extended=options.extended) ss.fromWSDL(wsdl) - fd = open( os.path.join(options.output_directory, ss.getServiceModuleName()+'.py'), 'w+') + fd = open( os.path.join(options.output_dir, ss.getServiceModuleName()+'.py'), 'w+') ss.write(fd) fd.close() Modified: trunk/zsi/doc/guide02-wsdl2py.tex =================================================================== --- trunk/zsi/doc/guide02-wsdl2py.tex 2006-06-05 19:27:15 UTC (rev 1236) +++ trunk/zsi/doc/guide02-wsdl2py.tex 2006-06-05 19:47:17 UTC (rev 1237) @@ -20,6 +20,7 @@ \item[-x, ---schema] Just process a schema (xsd) file and generate the types mapping file. \item[-d, ---debug] Output verbose debugging messages during code generation. +\item[-o OUTPUT_DIR, ---output-dir=OUTPUT_DIR] Write generated files to OUTPUT_DIR. \end{description} \subsubsection{Typecode Extensions (Stable) } @@ -194,7 +195,7 @@ \url{http://mathworld.wolfram.com/}, among others. \begin{verbatim} -wsdl2py.py --complexType --url=http://webservices.wolfram.com/services/SearchServices/WolframSearch2.wsdl +wsdl2py --complexType --url=http://webservices.wolfram.com/services/SearchServices/WolframSearch2.wsdl \end{verbatim} Run the above command to generate the service and type files. wsdl2py uses Modified: trunk/zsi/setup.py =================================================================== --- trunk/zsi/setup.py 2006-06-05 19:27:15 UTC (rev 1236) +++ trunk/zsi/setup.py 2006-06-05 19:47:17 UTC (rev 1237) @@ -47,7 +47,7 @@ # non-setuptools else: - additional_params['scripts'] = ["scripts/wsdl2py.py", "scripts/wsdl2dispatch.py"] + additional_params['scripts'] = ["scripts/wsdl2py", "scripts/wsdl2dispatch"] setup( name="ZSI", Modified: trunk/zsi/test/wsdl2py/README =================================================================== --- trunk/zsi/test/wsdl2py/README 2006-06-05 19:27:15 UTC (rev 1236) +++ trunk/zsi/test/wsdl2py/README 2006-06-05 19:47:17 UTC (rev 1237) @@ -21,7 +21,7 @@ To run only "network" tests: %./runTests.py net -To run only tests against the wsdl2dispatch.py tool: +To run only tests against the wsdl2dispatch tool: %./runTests.py dispatch @@ -89,7 +89,7 @@ "tracefile" -- show XML of individual messages as serialized/parsed. "debug" -- turn on verbose debugging information. - "skip" -- skip generation (wsdl2py.py and wsdl2dispatch.py) + "skip" -- skip generation (wsdl2py and wsdl2dispatch) "twisted" -- use twisted.web.client [dispatch] Modified: trunk/zsi/test/wsdl2py/ServiceTest.py =================================================================== --- trunk/zsi/test/wsdl2py/ServiceTest.py 2006-06-05 19:27:15 UTC (rev 1236) +++ trunk/zsi/test/wsdl2py/ServiceTest.py 2006-06-05 19:47:17 UTC (rev 1237) @@ -238,7 +238,7 @@ _wsdl = {} def _generate(self): - """call the wsdl2py.py and wsdl2dispatch.py scripts and + """call the wsdl2py and wsdl2dispatch scripts and automatically add the "-f" or "-u" argument. Other args can be appended via the "wsdl2py_args" and "wsdl2dispatch_args" instance attributes. @@ -266,7 +266,7 @@ try: # Client Stubs - wsdl2py = ['wsdl2py.py'] + args + self.wsdl2py_args + wsdl2py = ['wsdl2py'] + args + self.wsdl2py_args try: exit = subprocess.call(wsdl2py) except OSError, ex: @@ -280,7 +280,7 @@ # Service Stubs if '-x' not in self.wsdl2py_args: - wsdl2dispatch = (['wsdl2dispatch.py'] + args + + wsdl2dispatch = (['wsdl2dispatch'] + args + self.wsdl2dispatch_args) try: exit = subprocess.call(wsdl2dispatch) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
