[Pywps-commits] r1111 - in branches/pywps-3.2-soap/tests/Templates/1_0_0: . inc

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Feb 7 12:52:16 CET 2011


Author: jesus
Date: 2011-02-07 12:52:16 +0100 (Mon, 07 Feb 2011)
New Revision: 1111

Modified:
   branches/pywps-3.2-soap/tests/Templates/1_0_0/DescribeProcess.tmpl
   branches/pywps-3.2-soap/tests/Templates/1_0_0/Execute.tmpl
   branches/pywps-3.2-soap/tests/Templates/1_0_0/GetCapabilities.tmpl
   branches/pywps-3.2-soap/tests/Templates/1_0_0/inc/DescribeProcess_ComplexValue.tmpl
Log:
sync between test templates and used ones

Modified: branches/pywps-3.2-soap/tests/Templates/1_0_0/DescribeProcess.tmpl
===================================================================
--- branches/pywps-3.2-soap/tests/Templates/1_0_0/DescribeProcess.tmpl	2011-02-01 15:24:56 UTC (rev 1110)
+++ branches/pywps-3.2-soap/tests/Templates/1_0_0/DescribeProcess.tmpl	2011-02-07 11:52:16 UTC (rev 1111)
@@ -9,7 +9,7 @@
         <ows:Abstract><TMPL_VAR abstract></ows:Abstract>
         </TMPL_IF>
         <TMPL_LOOP Metadata>
-        <ows:Metadata xlink:title="<TMPL_VAR metadatatitle>" />
+        <ows:Metadata xlink:title="<TMPL_VAR title>" xlink:href="<TMPL_VAR href>" />
         </TMPL_LOOP>
         <TMPL_LOOP Profiles>
         <wps:Profile><TMPL_VAR profile></wps:Profile>

Modified: branches/pywps-3.2-soap/tests/Templates/1_0_0/Execute.tmpl
===================================================================
--- branches/pywps-3.2-soap/tests/Templates/1_0_0/Execute.tmpl	2011-02-01 15:24:56 UTC (rev 1110)
+++ branches/pywps-3.2-soap/tests/Templates/1_0_0/Execute.tmpl	2011-02-07 11:52:16 UTC (rev 1111)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="<TMPL_VAR encoding>"?>
-<wps:ExecuteResponse xmlns:wps="http://www.opengis.net/wps/1.0.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsGetCapabilities_response.xsd" service="WPS" version="1.0.0" xml:lang="<TMPL_VAR lang>" serviceInstance="<TMPL_VAR serviceinstance>" statusLocation="<TMPL_VAR statuslocation>">
+<wps:ExecuteResponse xmlns:wps="http://www.opengis.net/wps/1.0.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsExecute_response.xsd" service="WPS" version="1.0.0" xml:lang="<TMPL_VAR lang>" serviceInstance="<TMPL_VAR serviceinstance>" statusLocation="<TMPL_VAR statuslocation>">
     <wps:Process wps:processVersion="<TMPL_VAR processversion>">
         <ows:Identifier><TMPL_VAR identifier></ows:Identifier>
         <ows:Title><TMPL_VAR title></ows:Title>
@@ -7,7 +7,7 @@
         <ows:Abstract><TMPL_VAR abstract></ows:Abstract>
         </TMPL_IF>
         <TMPL_LOOP Metadata>
-        <ows:Metadata xlink:title="<TMPL_VAR metadatatitle>" />
+        <ows:Metadata xlink:title="<TMPL_VAR title>" xlink:href="<TMPL_VAR href>" />
         </TMPL_LOOP>
         <TMPL_LOOP Profiles>
         <wps:Profile><TMPL_VAR profile></wps:Profile>
@@ -79,8 +79,12 @@
         <wps:Output mimeType="<TMPL_VAR mimetype>" encoding="<TMPL_VAR encoding>" schema="<TMPL_VAR schema>" asReference="<TMPL_VAR asreference>">
         </TMPL_IF>
         <TMPL_IF literaldata>
+        <TMPL_IF uom>
         <wps:Output <TMPL_VAR uom>>
+        <TMPL_ELSE>
+        <wps:Output>
         </TMPL_IF>
+        </TMPL_IF>
         <TMPL_IF bboxdata>
         <wps:Output>
         </TMPL_IF>

Modified: branches/pywps-3.2-soap/tests/Templates/1_0_0/GetCapabilities.tmpl
===================================================================
--- branches/pywps-3.2-soap/tests/Templates/1_0_0/GetCapabilities.tmpl	2011-02-01 15:24:56 UTC (rev 1110)
+++ branches/pywps-3.2-soap/tests/Templates/1_0_0/GetCapabilities.tmpl	2011-02-07 11:52:16 UTC (rev 1111)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="<TMPL_VAR encoding>"?>
 <wps:Capabilities service="WPS" version="1.0.0" xml:lang="<TMPL_VAR lang>" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:wps="http://www.opengis.net/wps/1.0.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsGetCapabilities_response.xsd" updateSequence="1">
-        <Test></Test>
 	<ows:ServiceIdentification>
 		<ows:Title><TMPL_VAR servertitle></ows:Title>
                 <TMPL_IF serverabstract>
@@ -110,7 +109,7 @@
 			<ows:Abstract><TMPL_VAR abstract></ows:Abstract>
                         </TMPL_IF>
                         <TMPL_LOOP Metadata>
-			<ows:Metadata xlink:title="<TMPL_VAR metadatatitle>" />
+                        <ows:Metadata xlink:title="<TMPL_VAR title>" xlink:href="<TMPL_VAR href>" />
                         </TMPL_LOOP>
                         <TMPL_LOOP Profiles>
 			<wps:Profile><TMPL_VAR profile></wps:Profile>

Modified: branches/pywps-3.2-soap/tests/Templates/1_0_0/inc/DescribeProcess_ComplexValue.tmpl
===================================================================
--- branches/pywps-3.2-soap/tests/Templates/1_0_0/inc/DescribeProcess_ComplexValue.tmpl	2011-02-01 15:24:56 UTC (rev 1110)
+++ branches/pywps-3.2-soap/tests/Templates/1_0_0/inc/DescribeProcess_ComplexValue.tmpl	2011-02-07 11:52:16 UTC (rev 1111)
@@ -1,6 +1,6 @@
                     <Default>
                         <Format>
-                            <ows:MimeType><TMPL_VAR mimetype></ows:MimeType>
+                            <MimeType><TMPL_VAR mimetype></MimeType>
                             <TMPL_IF encoding>
                             <Encoding><TMPL_VAR encoding></Encoding>
                             </TMPL_IF>
@@ -12,7 +12,7 @@
                     <Supported>
                         <TMPL_LOOP Formats>
                         <Format>
-                            <ows:MimeType><TMPL_VAR mimetype></ows:MimeType>
+                            <MimeType><TMPL_VAR mimetype></MimeType>
                             <TMPL_IF encoding>
                             <Encoding><TMPL_VAR encoding></Encoding>
                             </TMPL_IF>



More information about the Pywps-commits mailing list