propagate soap errors

2024-08-08 13:23:27 +02:00
parent ea7a079cad
commit 5ae29966cd
9 changed files with 109 additions and 51 deletions
--- a/Resources/WSDL/SoapDeleteAuthor.process
+++ b/Resources/WSDL/SoapDeleteAuthor.process
@@ -20,7 +20,7 @@
    <pd:endX>486</pd:endX>
    <pd:endY>65</pd:endY>
    <pd:errorSchemas>
-        <Schema1 wsMsgRef="wsdlPfx:ErrorMessage"/>
+        <DeleteError wsMsgRef="wsdlPfx:ErrorMessage"/>
    </pd:errorSchemas>
    <pd:processVariables/>
    <pd:targetNamespace>http://xmlns.example.com/1721743176236</pd:targetNamespace>
@@ -47,7 +47,8 @@
        <pd:y>177</pd:y>
        <pd:handler>true</pd:handler>
        <config>
-            <catchAll>true</catchAll>
+            <catchAll>false</catchAll>
+            <fault>localname=ErrorMessage namespace=http://xmlns.example.com/1721737885605</fault>
        </config>
        <pd:inputBindings/>
    </pd:activity>
@@ -57,13 +58,13 @@
        <pd:x>420</pd:x>
        <pd:y>175</pd:y>
        <config>
-            <faultName/>
+            <faultName>DeleteError</faultName>
        </config>
        <pd:inputBindings>
            <ns3:ActivityInput>
-                <message>
-                    <xsl:value-of select="string($Catch/exceptiondata)"/>
-                </message>
+                <data>
+                    <xsl:copy-of select="$Catch/wsdlPfx:ErrorMessage"/>
+                </data>
            </ns3:ActivityInput>
        </pd:inputBindings>
    </pd:activity>
--- a/Resources/WSDL/SoapGetAuthor.process
+++ b/Resources/WSDL/SoapGetAuthor.process
@@ -21,7 +21,7 @@
    <pd:endX>547</pd:endX>
    <pd:endY>66</pd:endY>
    <pd:errorSchemas>
-        <Schema1 wsMsgRef="wsdlPfx:ErrorMessage"/>
+        <GetError wsMsgRef="wsdlPfx:ErrorMessage"/>
    </pd:errorSchemas>
    <pd:processVariables/>
    <pd:targetNamespace>http://xmlns.example.com/1721743176122</pd:targetNamespace>
@@ -44,15 +44,30 @@
    <pd:activity name="Catch">
        <pd:type>com.tibco.pe.core.CatchActivity</pd:type>
        <pd:resourceType>ae.activities.catch</pd:resourceType>
-        <pd:x>280</pd:x>
-        <pd:y>207</pd:y>
+        <pd:x>176</pd:x>
+        <pd:y>190</pd:y>
        <pd:handler>true</pd:handler>
        <config>
-            <catchAll>false</catchAll>
            <fault>localname=ErrorMessage namespace=http://xmlns.example.com/1721737885605</fault>
        </config>
        <pd:inputBindings/>
    </pd:activity>
+    <pd:activity name="Generate Error">
+        <pd:type>com.tibco.pe.core.GenerateErrorActivity</pd:type>
+        <pd:resourceType>ae.activities.throw</pd:resourceType>
+        <pd:x>331</pd:x>
+        <pd:y>188</pd:y>
+        <config>
+            <faultName>GetError</faultName>
+        </config>
+        <pd:inputBindings>
+            <ns1:ActivityInput>
+                <data>
+                    <xsl:copy-of select="$Catch/wsdlPfx:ErrorMessage"/>
+                </data>
+            </ns1:ActivityInput>
+        </pd:inputBindings>
+    </pd:activity>
    <pd:transition>
        <pd:from>Start</pd:from>
        <pd:to>XmlGET</pd:to>
@@ -69,7 +84,7 @@
    </pd:transition>
    <pd:transition>
        <pd:from>Catch</pd:from>
-        <pd:to>End</pd:to>
+        <pd:to>Generate Error</pd:to>
        <pd:lineType>Default</pd:lineType>
        <pd:lineColor>-16777216</pd:lineColor>
        <pd:conditionType>always</pd:conditionType>
--- a/Resources/WSDL/SoapPostAuthor.process
+++ b/Resources/WSDL/SoapPostAuthor.process
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<pd:ProcessDefinition xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pd="http://xmlns.tibco.com/bw/process/2003" xmlns:ns="http://www.demo.com/author" xmlns:wsdlPfx="http://xmlns.example.com/1721737885605" xmlns:ns2="http://www.tibco.com/schemas/httpRequest/Resources/schemas/Schema.xsd">
+<pd:ProcessDefinition xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pd="http://xmlns.tibco.com/bw/process/2003" xmlns:ns="http://www.demo.com/author" xmlns:wsdlPfx="http://xmlns.example.com/1721737885605" xmlns:ns2="http://www.tibco.com/schemas/httpRequest/Resources/schemas/Schema.xsd" xmlns:ns1="http://www.tibco.com/pe/GenerateErrorActivity/InputSchema">
    <wsdl:import namespace="http://xmlns.example.com/1721737885605" location="/Resources/WSDL/WSDL.wsdl"/>
    <pd:name>Resources/WSDL/SoapPostAuthor.process</pd:name>
    <pd:startName>Start</pd:startName>
@@ -20,7 +20,7 @@
    <pd:endX>529</pd:endX>
    <pd:endY>73</pd:endY>
    <pd:errorSchemas>
-        <Schema1 wsMsgRef="wsdlPfx:ErrorMessage"/>
+        <PostError wsMsgRef="wsdlPfx:ErrorMessage"/>
    </pd:errorSchemas>
    <pd:processVariables/>
    <pd:targetNamespace>http://xmlns.example.com/1721743175988</pd:targetNamespace>
@@ -45,23 +45,24 @@
        <pd:y>256</pd:y>
        <pd:handler>true</pd:handler>
        <config>
-            <catchAll>true</catchAll>
+            <catchAll>false</catchAll>
+            <fault>localname=ErrorMessage namespace=http://xmlns.example.com/1721737885605</fault>
        </config>
        <pd:inputBindings/>
    </pd:activity>
    <pd:activity name="Generate Error">
        <pd:type>com.tibco.pe.core.GenerateErrorActivity</pd:type>
        <pd:resourceType>ae.activities.throw</pd:resourceType>
-        <pd:x>445</pd:x>
-        <pd:y>258</pd:y>
+        <pd:x>449</pd:x>
+        <pd:y>256</pd:y>
        <config>
-            <faultName/>
+            <faultName>PostError</faultName>
        </config>
        <pd:inputBindings>
-            <ns1:ActivityInput xmlns:ns1="http://www.tibco.com/pe/GenerateErrorActivity/InputSchema">
-                <message>
-                    <xsl:value-of xmlns:xsl="http://www.w3.org/1999/XSL/Transform" select="string($Catch/exceptiondata)"/>
-                </message>
+            <ns1:ActivityInput>
+                <data>
+                    <xsl:copy-of select="$Catch/wsdlPfx:ErrorMessage"/>
+                </data>
            </ns1:ActivityInput>
        </pd:inputBindings>
    </pd:activity>
--- a/Resources/WSDL/SoapPutAuthor.process
+++ b/Resources/WSDL/SoapPutAuthor.process
@@ -20,14 +20,14 @@
    <pd:endX>450</pd:endX>
    <pd:endY>65</pd:endY>
    <pd:errorSchemas>
-        <Schema1 wsMsgRef="wsdlPfx:ErrorMessage"/>
+        <PutError wsMsgRef="wsdlPfx:ErrorMessage"/>
    </pd:errorSchemas>
    <pd:processVariables/>
    <pd:targetNamespace>http://xmlns.example.com/1721743176182</pd:targetNamespace>
    <pd:activity name="XmlPUT">
        <pd:type>com.tibco.pe.core.CallProcessActivity</pd:type>
        <pd:resourceType>ae.process.subprocess</pd:resourceType>
-        <pd:x>252</pd:x>
+        <pd:x>258</pd:x>
        <pd:y>65</pd:y>
        <config>
            <processName>/Processes/xml/author/XmlPUT.process</processName>
@@ -70,7 +70,8 @@
        <pd:y>201</pd:y>
        <pd:handler>true</pd:handler>
        <config>
-            <catchAll>true</catchAll>
+            <catchAll>false</catchAll>
+            <fault>localname=ErrorMessage namespace=http://xmlns.example.com/1721737885605</fault>
        </config>
        <pd:inputBindings/>
    </pd:activity>
@@ -80,13 +81,13 @@
        <pd:x>337</pd:x>
        <pd:y>204</pd:y>
        <config>
-            <faultName/>
+            <faultName>PutError</faultName>
        </config>
        <pd:inputBindings>
            <ns1:ActivityInput>
-                <message>
-                    <xsl:value-of select="string($Catch/exceptiondata)"/>
-                </message>
+                <data>
+                    <xsl:copy-of select="$Catch/wsdlPfx:ErrorMessage"/>
+                </data>
            </ns1:ActivityInput>
        </pd:inputBindings>
    </pd:activity>