diff --git a/.designtimelibs b/.designtimelibs index a285d59..2babc4d 100644 --- a/.designtimelibs +++ b/.designtimelibs @@ -1,4 +1,4 @@ #Design time libraries #Format: #=File Alias=Description -#Thu Aug 08 13:20:13 CEST 2024 +#Fri Aug 09 11:07:23 CEST 2024 0=ProjectLibrary.projlib1\= diff --git a/.folder b/.folder index cc403e7..d76affa 100644 --- a/.folder +++ b/.folder @@ -8,8 +8,8 @@ - + diff --git a/Processes/rest/rest request.process b/Processes/rest/RestRequest.process similarity index 86% rename from Processes/rest/rest request.process rename to Processes/rest/RestRequest.process index b9075e1..4543043 100644 --- a/Processes/rest/rest request.process +++ b/Processes/rest/RestRequest.process @@ -1,7 +1,7 @@ - + - Processes/rest/rest request.process + Processes/rest/RestRequest.process HTTP Receiver 0 0 @@ -9,8 +9,8 @@ com.tibco.plugin.http.HTTPEventSource httppalette.httpEventSource - 168 - 252 + 112 + 349 String ISO8859_1 @@ -37,9 +37,8 @@ End - - 784 - 259 + 814 + 350 @@ -53,14 +52,14 @@ http://xmlns.example.com/1719474540368 - + com.tibco.pe.core.CallProcessActivity ae.process.subprocess - 355 - 261 + 262 + 357 - /Processes/xml/xml.process - if ($_globalVariables/pfx:GlobalVariables/processType='sql') then '/Processes/sql/InitializeDatabase.process' else '/Processes/xml/xml.process' + /Processes/sql/InitializeDatabase.process + if ($_globalVariables/pfx:GlobalVariables/processType='sql') then '/Processes/sql/InitializeDatabase.process' else '/Processes/xml/Xml.process' false @@ -77,8 +76,8 @@ com.tibco.plugin.http.HTTPResponseActivity httppalette.httpWebResponse - 610 - 257 + 584 + 349 true HTTP Receiver @@ -107,8 +106,8 @@ com.tibco.plugin.xml.XMLRendererActivity ae.activities.XMLRendererActivity - 481 - 254 + 432 + 349 text true @@ -126,29 +125,29 @@ - + - + - + com.tibco.pe.core.CatchActivity ae.activities.catch - 246 - 440 + 357 + 202 true - true + localname=root namespace=http://www.tibco.com/schemas/httpRequest/Resources/schemas/Schema.xsd2 - + com.tibco.plugin.http.HTTPResponseActivity httppalette.httpWebResponse - 432 - 442 + 584 + 202 true HTTP Receiver @@ -170,14 +169,14 @@ - + HTTP Receiver - select database type + Select Database Type Default -16777216 always @@ -190,7 +189,7 @@ always - select database type + Select Database Type Render XML Default -16777216 @@ -204,14 +203,14 @@ always - Catch - ErrorResponse + CatchRestError + RestErrorResponse Default -16777216 always - ErrorResponse + RestErrorResponse End Default -16777216 diff --git a/Processes/sql/InitializeDatabase.process b/Processes/sql/InitializeDatabase.process index e5bc19b..b83dc5b 100644 --- a/Processes/sql/InitializeDatabase.process +++ b/Processes/sql/InitializeDatabase.process @@ -1,6 +1,7 @@ - + + Processes/sql/InitializeDatabase.process Start @@ -13,10 +14,10 @@ - 54 - 121 + 80 + 163 - + End @@ -29,16 +30,18 @@ - 823 - 117 - + 838 + 163 + + + http://xmlns.example.com/1719483377637 - + com.tibco.plugin.jdbc.JDBCGeneralActivity ae.activities.JDBCGeneralActivity - 280 - 123 + 308 + 169 10 false @@ -53,11 +56,11 @@ - + com.tibco.pe.core.CallProcessActivity ae.process.subprocess - 468 - 117 + 513 + 163 /Processes/sql/SelectDatabase.process @@ -72,25 +75,59 @@ + + com.tibco.pe.core.CatchActivity + ae.activities.catch + 365 + 288 + true + + localname=root namespace=http://www.tibco.com/schemas/httpRequest/Resources/schemas/Schema.xsd2 + + + + + com.tibco.pe.core.GenerateErrorActivity + ae.activities.throw + 543 + 288 + + Error + + + + + + + + + Start - initialize database + Initialize Database Default -16777216 always - initialize database - select operation + Initialize Database + Select Operation Default -16777216 always - select operation + Select Operation End Default -16777216 always + + Catch + Generate Error + Default + -16777216 + always + \ No newline at end of file diff --git a/Processes/sql/SelectDatabase.process b/Processes/sql/SelectDatabase.process index 635a604..0796738 100644 --- a/Processes/sql/SelectDatabase.process +++ b/Processes/sql/SelectDatabase.process @@ -1,6 +1,7 @@ - + + Processes/sql/SelectDatabase.process Start @@ -13,13 +14,13 @@ - 156 - 180 + 130 + 163 - + - + @@ -34,16 +35,18 @@ - 802 - 184 - + 796 + 163 + + + http://xmlns.example.com/1719567794423 - + com.tibco.pe.core.CallProcessActivity ae.process.subprocess - 603 - 304 + 563 + 317 /Processes/sql/author/SqlPOST.process concat('/Processes/sql/author/Sql',$Start/root/method ,'.process') @@ -52,32 +55,32 @@ - + - + - + - + - + - + - + com.tibco.plugin.mapper.MapperActivity ae.activities.MapperActivity - 388 - 183 + 353 + 170 @@ -117,11 +120,11 @@ - + com.tibco.pe.core.CallProcessActivity ae.process.subprocess - 600 - 74 + 567 + 163 /Processes/sql/author/SqlGET.process concat('/Processes/sql/author/Sql',$Start/root/method ,'.process') @@ -129,46 +132,83 @@ - + + + com.tibco.pe.core.CatchActivity + ae.activities.catch + 399 + 509 + true + + false + localname=root namespace=http://www.tibco.com/schemas/httpRequest/Resources/schemas/Schema.xsd2 + + + + + com.tibco.pe.core.GenerateErrorActivity + ae.activities.throw + 658 + 507 + + Schema0 + + + + + + + + + Start - Map Data + Get Author From Raw Data Default -16777216 always - Map Data - SqlGET_DELETE + Get Author From Raw Data + Sql Get Delete + GetDelete Default -16777216 xpath $Start/root/method = 'DELETE' or $Start/root/method = 'GET' - Map Data - SqlPOST_PUT + Get Author From Raw Data + Sql Post Put + PostPut Default -16777216 xpath $Start/root/method = 'PUT' or $Start/root/method = 'POST' - SqlPOST_PUT + Sql Post Put End Default -16777216 always - SqlGET_DELETE + Sql Get Delete End Default -16777216 always + + Catch + Generate Error + Default + -16777216 + always + \ No newline at end of file diff --git a/Processes/sql/author/SqlDELETE.process b/Processes/sql/author/SqlDELETE.process index ca0b7b5..e4a863a 100644 --- a/Processes/sql/author/SqlDELETE.process +++ b/Processes/sql/author/SqlDELETE.process @@ -1,6 +1,7 @@ - + + Processes/sql/author/SqlDELETE.process Start @@ -17,7 +18,7 @@ - + @@ -34,10 +35,12 @@ 681 62 - + + + http://xmlns.example.com/1719579163583 - + com.tibco.plugin.jdbc.JDBCUpdateActivity ae.activities.JDBCUpdateActivity 424 @@ -66,8 +69,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 249 - 164 + 256 + 328 true true @@ -77,20 +80,24 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 514 - 165 + 516 + 331 - + DeleteError - - - + + + + + + + - + com.tibco.pe.core.WriteToLogActivity ae.activities.log 284 @@ -106,12 +113,32 @@ + + com.tibco.pe.core.GenerateErrorActivity + ae.activities.throw + 427 + 232 + + DeleteError + + + + + + + + + + + + + - DeleteAuthor + Delete Author End Default -16777216 - always + otherwise Catch @@ -122,16 +149,25 @@ Start - LogInputData + Log Input Data Default -16777216 always - LogInputData - DeleteAuthor + Log Input Data + Delete Author Default -16777216 always + + Delete Author + Author With Given Id Does Not Exist + authorDoesNotExist + Default + -16777216 + xpath + $Delete-Author/jdbcUpdateActivityOutput/noOfUpdates = 0 + \ No newline at end of file diff --git a/Processes/sql/author/SqlGET.process b/Processes/sql/author/SqlGET.process index fb11038..8560591 100644 --- a/Processes/sql/author/SqlGET.process +++ b/Processes/sql/author/SqlGET.process @@ -1,6 +1,7 @@ - + + Processes/sql/author/SqlGET.process Start @@ -17,25 +18,25 @@ - + - + - + - + - + - + - + @@ -54,22 +55,14 @@ - 726 - 108 + 730 + 105 - - - - - - - - - + http://xmlns.example.com/1719579163583 - + com.tibco.plugin.jdbc.JDBCQueryActivity ae.activities.JDBCQueryActivity 463 @@ -122,7 +115,7 @@ - + com.tibco.pe.core.WriteToLogActivity ae.activities.log 285 @@ -141,8 +134,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 257 - 246 + 259 + 407 true true @@ -152,65 +145,53 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 427 - 248 + 429 + 409 - + GetError - - - + + + + + + + - - com.tibco.plugin.xml.XMLRendererActivity - ae.activities.XMLRendererActivity - 599 - 111 + + com.tibco.pe.core.GenerateErrorActivity + ae.activities.throw + 465 + 244 - text - true - true - + GetError - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + Start - LogInputData + Log Input Data Default -16777216 always - LogInputData - GetAuthor + Log Input Data + Get Author Default -16777216 always @@ -223,17 +204,19 @@ always - GetAuthor - Render XML + Get Author + End + authorExist Default -16777216 - always + xpath + boolean($Get-Author/resultSet/Record[1]/id) - Render XML - End + Get Author + Author Does Not Exist Default -16777216 - always + otherwise \ No newline at end of file diff --git a/Processes/sql/author/SqlPOST.process b/Processes/sql/author/SqlPOST.process index 96d77e9..104a68b 100644 --- a/Processes/sql/author/SqlPOST.process +++ b/Processes/sql/author/SqlPOST.process @@ -1,6 +1,7 @@ - + + Processes/sql/author/SqlPOST.process Start @@ -34,10 +35,12 @@ 778 112 - + + + http://xmlns.example.com/1719579163583 - + com.tibco.plugin.jdbc.JDBCUpdateActivity ae.activities.JDBCUpdateActivity 384 @@ -119,7 +122,7 @@ - + com.tibco.pe.core.WriteToLogActivity ae.activities.log 274 @@ -138,8 +141,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 281 - 239 + 288 + 323 true true @@ -149,21 +152,28 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 422 - 240 + 429 + 324 - + PostError + + + + + + + - AddAuthor + Add Author End Default -16777216 @@ -171,14 +181,14 @@ Start - LogInputData + Log Input Data Default -16777216 always - LogInputData - AddAuthor + Log Input Data + Add Author Default -16777216 always diff --git a/Processes/sql/author/SqlPUT.process b/Processes/sql/author/SqlPUT.process index bbc0ed6..d7e26df 100644 --- a/Processes/sql/author/SqlPUT.process +++ b/Processes/sql/author/SqlPUT.process @@ -1,6 +1,7 @@ - + + Processes/sql/author/SqlPUT.process Start @@ -17,7 +18,7 @@ - + @@ -34,10 +35,12 @@ 644 66 - + + + http://xmlns.example.com/1719579163583 - + com.tibco.plugin.jdbc.JDBCUpdateActivity ae.activities.JDBCUpdateActivity 387 @@ -122,7 +125,7 @@ WHERE id = ?; - + com.tibco.pe.core.WriteToLogActivity ae.activities.log 255 @@ -141,8 +144,8 @@ WHERE id = ?; com.tibco.pe.core.CatchActivity ae.activities.catch - 308 - 228 + 313 + 327 true true @@ -152,36 +155,62 @@ WHERE id = ?; com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 446 - 226 + 451 + 325 - + PutError - - - - + + + + + + + + + + + + + com.tibco.pe.core.GenerateErrorActivity + ae.activities.throw + 390 + 208 + + PutError + + + + + + + + + + - UpdateAuthor + Update Author End + authorExist Default -16777216 - always + xpath + $Update-Author/jdbcUpdateActivityOutput/noOfUpdates = 1 Start - LogInputData + Log Input Data Default -16777216 always - LogInputData - UpdateAuthor + Log Input Data + Update Author Default -16777216 always @@ -193,4 +222,11 @@ WHERE id = ?; -16777216 always + + Update Author + UpdateError + Default + -16777216 + otherwise + \ No newline at end of file diff --git a/Processes/xml/xml.process b/Processes/xml/Xml.process similarity index 89% rename from Processes/xml/xml.process rename to Processes/xml/Xml.process index 91b824d..590b6d5 100644 --- a/Processes/xml/xml.process +++ b/Processes/xml/Xml.process @@ -1,7 +1,7 @@ - Processes/xml/xml.process + Processes/xml/Xml.process Start @@ -13,13 +13,13 @@ - 67 - 77 + 86 + 180 - + - + @@ -34,16 +34,16 @@ - 732 - 85 + 758 + 180 http://xmlns.example.com/1719484154608 - + com.tibco.pe.core.CallProcessActivity ae.process.subprocess - 545 - 41 + 530 + 180 /Processes/xml/author/XmlPOST.process concat('/Processes/xml/author/Xml',$Start/root/method ,'.process') @@ -76,8 +76,8 @@ com.tibco.plugin.mapper.MapperActivity ae.activities.MapperActivity - 267 - 73 + 318 + 180 @@ -120,8 +120,8 @@ com.tibco.pe.core.WriteToLogActivity ae.activities.log - 156 - 73 + 178 + 180 User @@ -133,11 +133,11 @@ - + com.tibco.pe.core.CallProcessActivity ae.process.subprocess - 539 - 147 + 527 + 343 /Processes/xml/author/XmlGET.process concat('/Processes/xml/author/Xml',$Start/root/method ,'.process') @@ -151,7 +151,7 @@ - XmlPOST_PUT + XmlPostPut End Default -16777216 @@ -159,8 +159,8 @@ Map Data - XmlPOST_PUT - post or put + XmlPostPut + postOrPut Default -16777216 xpath @@ -182,15 +182,15 @@ Map Data - XmlGET_DELETE - get or delete + XmlGetDelete + getOrDelete Default -16777216 xpath $Start/root/method = 'DELETE' or $Start/root/method = 'GET' - XmlGET_DELETE + XmlGetDelete End Default -16777216 diff --git a/Processes/xml/author/XmlDELETE.process b/Processes/xml/author/XmlDELETE.process index 8c4cce1..5685a3b 100644 --- a/Processes/xml/author/XmlDELETE.process +++ b/Processes/xml/author/XmlDELETE.process @@ -14,8 +14,8 @@ - 149 - 258 + 184 + 205 @@ -34,8 +34,8 @@ - 1010 - 262 + 1072 + 205 @@ -44,8 +44,8 @@ com.tibco.plugin.file.FileReadActivity ae.activities.FileReadActivity - 301 - 257 + 373 + 205 text @@ -60,8 +60,8 @@ com.tibco.plugin.xml.XMLParseActivity ae.activities.XMLParseActivity - 461 - 259 + 514 + 205 text default @@ -74,11 +74,11 @@ - + com.tibco.plugin.mapper.MapperActivity ae.activities.MapperActivity - 616 - 266 + 680 + 213 @@ -91,22 +91,22 @@ com.tibco.plugin.xml.XMLRendererActivity ae.activities.XMLRendererActivity - 777 - 258 + 821 + 205 text false - + com.tibco.plugin.file.FileWriteActivity ae.activities.FileWriteActivity - 893 - 260 + 959 + 205 text None @@ -125,8 +125,8 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 460 - 88 + 515 + 390 DeleteError @@ -160,13 +160,13 @@ Parse XML - remove author with given id + Remove Author By Id Default -16777216 otherwise - remove author with given id + Remove Author By Id Render XML Default -16777216 diff --git a/Processes/xml/author/XmlGET.process b/Processes/xml/author/XmlGET.process index 6d92c12..03953f0 100644 --- a/Processes/xml/author/XmlGET.process +++ b/Processes/xml/author/XmlGET.process @@ -17,7 +17,7 @@ 76 - + @@ -74,7 +74,7 @@ - + com.tibco.plugin.mapper.MapperActivity ae.activities.MapperActivity 706 @@ -112,7 +112,7 @@ Parse XML - get author by id + Get Author By Id Default -16777216 always @@ -132,16 +132,16 @@ always - get author by id + Get Author By Id Generate Error author does not exist Default -16777216 xpath - not(boolean($get-author-by-id/pfx2:authors/pfx2:author[@id=$Start/root/id ] )) + not(boolean($Get-Author-By-Id/pfx2:authors/pfx2:author[@id=$Start/root/id ] )) - get author by id + Get Author By Id End Default -16777216 diff --git a/Processes/xml/author/XmlPOST.process b/Processes/xml/author/XmlPOST.process index 9a95ecd..7998e69 100644 --- a/Processes/xml/author/XmlPOST.process +++ b/Processes/xml/author/XmlPOST.process @@ -73,7 +73,7 @@ - + com.tibco.plugin.mapper.MapperActivity ae.activities.MapperActivity 509 @@ -99,7 +99,7 @@ - + @@ -122,11 +122,11 @@ - + com.tibco.plugin.xml.XMLRendererActivity ae.activities.XMLRendererActivity - 193 - 339 + 192 + 348 text false @@ -134,7 +134,7 @@ - + com.tibco.plugin.file.FileWriteActivity ae.activities.FileWriteActivity 508 @@ -149,7 +149,7 @@ - + @@ -186,7 +186,7 @@ Read File Parse XML - file not empty + fileNotEmpty Default -16777216 xpath @@ -194,13 +194,13 @@ Parse XML - add author + Add Author Default -16777216 otherwise - add author + Add Author Render XML Default -16777216 @@ -222,21 +222,21 @@ Read File - Render-XML-1 + Add Authors Template Default -16777216 otherwise - Render-XML-1 - Write-File-1 + Add Authors Template + InitializeFile Default -16777216 always - Write-File-1 - add author + InitializeFile + Add Author Default -16777216 always @@ -244,7 +244,7 @@ Parse XML Generate Error - author with given id already exist + authorWithGivenIdAlreadyExist Default -16777216 xpath diff --git a/Processes/xml/author/XmlPUT.process b/Processes/xml/author/XmlPUT.process index 6bb4e1b..5121711 100644 --- a/Processes/xml/author/XmlPUT.process +++ b/Processes/xml/author/XmlPUT.process @@ -33,14 +33,14 @@ - 848 - 151 + 849 + 147 http://xmlns.example.com/1719920186128 - + com.tibco.plugin.file.FileReadActivity ae.activities.FileReadActivity 193 @@ -69,15 +69,15 @@ - + - + com.tibco.plugin.mapper.MapperActivity ae.activities.MapperActivity 465 - 156 + 155 @@ -100,7 +100,7 @@ - + @@ -126,8 +126,8 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 347 - 291 + 342 + 290 PutError @@ -147,13 +147,13 @@ Start - Read-File-1 + Read File Default -16777216 always - Read-File-1 + Read File Parse XML Default -16777216 @@ -161,13 +161,13 @@ Parse XML - update author with given id + Update Author With Id Default -16777216 otherwise - update author with given id + Update Author With Id Render XML Default -16777216 @@ -190,7 +190,7 @@ Parse XML Generate Error - author does not exist + authorDoesNotExist Default -16777216 xpath diff --git a/Resources/WSDL/SoapDeleteAuthor.process b/Resources/WSDL/SoapDeleteAuthor.process index 6437f0f..da8c3a7 100644 --- a/Resources/WSDL/SoapDeleteAuthor.process +++ b/Resources/WSDL/SoapDeleteAuthor.process @@ -43,8 +43,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 229 - 177 + 205 + 181 true false @@ -55,8 +55,8 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 420 - 175 + 422 + 181 DeleteError diff --git a/Resources/WSDL/SoapGetAuthor.process b/Resources/WSDL/SoapGetAuthor.process index d4b1d45..484d6e9 100644 --- a/Resources/WSDL/SoapGetAuthor.process +++ b/Resources/WSDL/SoapGetAuthor.process @@ -44,8 +44,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 176 - 190 + 204 + 234 true localname=ErrorMessage namespace=http://xmlns.example.com/1721737885605 @@ -55,8 +55,8 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 331 - 188 + 431 + 234 GetError diff --git a/Resources/WSDL/SoapPostAuthor.process b/Resources/WSDL/SoapPostAuthor.process index 3291632..edb8872 100644 --- a/Resources/WSDL/SoapPostAuthor.process +++ b/Resources/WSDL/SoapPostAuthor.process @@ -41,8 +41,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 295 - 256 + 236 + 214 true false @@ -53,8 +53,8 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 449 - 256 + 431 + 214 PostError diff --git a/Resources/WSDL/SoapPutAuthor.process b/Resources/WSDL/SoapPutAuthor.process index 645e88e..8118417 100644 --- a/Resources/WSDL/SoapPutAuthor.process +++ b/Resources/WSDL/SoapPutAuthor.process @@ -66,8 +66,8 @@ com.tibco.pe.core.CatchActivity ae.activities.catch - 194 - 201 + 222 + 204 true false @@ -78,7 +78,7 @@ com.tibco.pe.core.GenerateErrorActivity ae.activities.throw - 337 + 356 204 PutError diff --git a/Resources/databases/database.db b/Resources/databases/database.db index 5c1eef2..5e64d60 100644 Binary files a/Resources/databases/database.db and b/Resources/databases/database.db differ