From 583782202e38046cf9530c1098ff887f45727a4e Mon Sep 17 00:00:00 2001 From: Martijn Dirkse Date: Thu, 19 Sep 2024 13:56:07 +0200 Subject: [PATCH] Have the code to explain XA and error store --- ...evelopmentIntegrationPatternsMessageId.zip | Bin 5352 -> 5352 bytes .../advancedDevelopmentProperties.zip | Bin 1480 -> 1480 bytes .../downloads/configurations/NewHorizons.zip | Bin 8078 -> 8078 bytes .../configurations/NewHorizonsDatabase.zip | Bin 3064 -> 3064 bytes .../NewHorizonsOnlyTableBooking.zip | Bin 5653 -> 5653 bytes .../configurations/NewHorizonsValidate.zip | Bin 5053 -> 5053 bytes .../downloads/configurations/credentials.zip | Bin 612 -> 612 bytes .../configurations/forFrankConsole.zip | Bin 7030 -> 7030 bytes .../configurations/forFrankConsole_2.zip | Bin 10434 -> 10434 bytes .../downloads/configurations/hermesBridge.zip | Bin 4470 -> 4470 bytes docs/source/downloads/deploymentTomcat.zip | Bin 6162 -> 6162 bytes docs/source/downloads/extendLadybugTable.zip | Bin 2110 -> 2110 bytes docs/source/downloads/ladybug.zip | Bin 13034 -> 13034 bytes docs/source/downloads/sandbox/v01.zip | Bin 144 -> 144 bytes .../Frank2Transactions/v510/async-config.md | 57 +++++++++++++++++ .../Frank2Transactions/v510/async-config.txt | 58 ++++++++++++++++++ .../Frank2Transactions/v510/docker-compose.md | 24 ++++++++ .../v510/docker-compose.txt | 25 ++++++++ .../v510/reference-queue.md | 14 +++++ .../v510/reference-queue.txt | 15 +++++ .../v510/docker-compose.yml | 22 +++++++ srcSteps/Frank2Transactions/v510/meta.yml | 47 ++++++++++++++ .../v510/src/main/resources/Configuration.xml | 55 +++++++++++++++++ .../src/main/resources/DatabaseChangelog.xml | 49 +++++++++++++++ .../resources/DeploymentSpecifics.properties | 2 + .../v510/src/main/resources/resources.yml | 12 ++++ 26 files changed, 380 insertions(+) create mode 100644 docs/source/snippets/Frank2Transactions/v510/async-config.md create mode 100644 docs/source/snippets/Frank2Transactions/v510/async-config.txt create mode 100644 docs/source/snippets/Frank2Transactions/v510/docker-compose.md create mode 100644 docs/source/snippets/Frank2Transactions/v510/docker-compose.txt create mode 100644 docs/source/snippets/Frank2Transactions/v510/reference-queue.md create mode 100644 docs/source/snippets/Frank2Transactions/v510/reference-queue.txt create mode 100644 srcSteps/Frank2Transactions/v510/docker-compose.yml create mode 100644 srcSteps/Frank2Transactions/v510/meta.yml create mode 100644 srcSteps/Frank2Transactions/v510/src/main/resources/Configuration.xml create mode 100644 srcSteps/Frank2Transactions/v510/src/main/resources/DatabaseChangelog.xml create mode 100644 srcSteps/Frank2Transactions/v510/src/main/resources/DeploymentSpecifics.properties create mode 100644 srcSteps/Frank2Transactions/v510/src/main/resources/resources.yml diff --git a/docs/source/downloads/advancedDevelopmentIntegrationPatternsMessageId.zip b/docs/source/downloads/advancedDevelopmentIntegrationPatternsMessageId.zip index 90d85e2ec3dbe90476cf26e2e91cfe7389870a50..4925320dcf91a20b8d39f5c55a22b7bfe51c8514 100644 GIT binary patch delta 97 zcmaE%`9hO7z?+#xgaHJWI8UXsiAeR6D diff --git a/docs/source/downloads/advancedDevelopmentProperties.zip b/docs/source/downloads/advancedDevelopmentProperties.zip index ddd388a944f9010efc50ca38dc6ef267b6f5ca79..905ff6f59c4646f38e4550f51084dd5d4a4963dc 100644 GIT binary patch delta 78 zcmX@XeS(`ez?+#xgaHJWO<>xYB>+rMV+jM( M?^!azbTn%&0C5W#QUCw| delta 78 zcmX@XeS(`ez?+#xgaHI5O*NRvTg(ikHZ}_}g6PdN7?qhojLG|$o4~X)O8}Uj#u5gm M-?L1ftm0D+?z(f|Me diff --git a/docs/source/downloads/configurations/NewHorizons.zip b/docs/source/downloads/configurations/NewHorizons.zip index 1b52903446abd3fea32af3c2b30ef92245e50502..d8b09888955169a630da6b83addad3c8f791ba4b 100644 GIT binary patch delta 113 zcmeCP@3ZF(@MdNaVE}<;dBz)g%~_a%^k#RKi_Bn#G>1MnnBgn@j}ye0>?a!trWeTu hgXtf#W?CNse7n#8fX%2mEFvC~)A18=0*-thQOfQlR h2Gc)e&A_ywoHLj%m$L!W+vFU;^iMetFzq7m1ptlaB)k9s diff --git a/docs/source/downloads/configurations/NewHorizonsDatabase.zip b/docs/source/downloads/configurations/NewHorizonsDatabase.zip index 004abb341e1cf8342cc142b6d48a3a18dd6e835f..a6ca8ec6be22d44e74c3c117e575e9b56da9b4c5 100644 GIT binary patch delta 61 zcmew%{zIHMz?+#xgaHJW*38E*T;|d1TD%>_;I+@!6OfTaO0svSx B6b=9Y delta 61 zcmew%{zIHMz?+#xgaHI5O*NRvyO$YAZ9Myr6GTrw#}y2wRk&@ybTYRCm|n&m1OQ=x B6m9?j diff --git a/docs/source/downloads/configurations/NewHorizonsOnlyTableBooking.zip b/docs/source/downloads/configurations/NewHorizonsOnlyTableBooking.zip index da29e16926fb862dcc188d629369bee902465447..052d4fc6f175aaa7ca421de4dc54889dd96e03c9 100644 GIT binary patch delta 80 zcmbQLGgXH-z?+#xgaHJWgYL5#_pM1sLIho~8tb`-S% N(+#2yVEV9V5CDci7)SsB delta 80 zcmbQLGgXH-z?+#xgaHI5O*PoaYtF(9q&K^>q_cq;8@c{*f*6xGi3Edb4pB2O?I>yk NrW-^Z!1Q6!AOM#L7{~ws diff --git a/docs/source/downloads/configurations/NewHorizonsValidate.zip b/docs/source/downloads/configurations/NewHorizonsValidate.zip index ca4a6b5bd3a59a5771e2429562238c3e9ce5e967..02cb8b1ea68178bf9fdb3ebfc9e365385ff26968 100644 GIT binary patch delta 80 zcmdn1zE_<$z?+#xgaHJW@Ix4p9RD~$B9o(pg2D6#Au}-jQpg5O MYY01l>1^R30GGlTmH+?% diff --git a/docs/source/downloads/configurations/credentials.zip b/docs/source/downloads/configurations/credentials.zip index 13166502adebd62c0d8741ff56ffd92744a53b82..26dce1ab7f4ccf02735bcc8376ffb773f77281d8 100644 GIT binary patch delta 30 hcmaFD@`Qyqz?+#xgaHJWgMkc2K513ISTEh%tO#UrV h3#O|jy}|TJNe?hBA{7Frv!$ZI^a&{+FfA?}4*>g1B`g2{ delta 112 zcmexn_RWkpz?+#xgaHI5O*NRvTg42dHg=^jg6Pd38B5v0j7&}e9x$Uuw1yePnEYF! h7ED)5dV}eck{)1ML@ESKXG=wa=@U{uU|L){9snS|CF}qI diff --git a/docs/source/downloads/configurations/forFrankConsole_2.zip b/docs/source/downloads/configurations/forFrankConsole_2.zip index 9ab4fa8dbb5ca4e4f7490db3bc1a9ed9f1497510..0bab26bfb81d37fc0687a8338c34af5beeed5447 100644 GIT binary patch delta 129 zcmX>UcqouJz?+#xgaHJWUcqouJz?+#xgaHI5O*NRvTg42dHg@e}1kszlnew^7jJ-Ui>|lneh#?P{k*Uzg r3Svxtt6B@DbJe`T^lmi|FwLeO4yF^-L%{TQ^(ZhcqTvIklQrT2vl}aj diff --git a/docs/source/downloads/configurations/hermesBridge.zip b/docs/source/downloads/configurations/hermesBridge.zip index f910216f149949bd866572199eb58604f6d0ac29..e8f0854386b553663a132d80c0e7f6ce10c4270b 100644 GIT binary patch delta 80 zcmeyS^i7F3z?+#xgaHJWr!F0X2GnhUq?h61O7(H(Q delta 194 zcmbPaFv);7z?+#xgaHI5O*Poa%gfFTq&Lg5JF$QmlasjbfCU_R6d1vb6kbIpFr$Ot z8O)e`PH+ZTX{JyCSmKV5B3S7p5i_v3rARcGo-Sevrq7GmgK0rgh`g6*2$;W6G#yNH ei$#FxG_gc5eM&3=OzVpKgXwy4XE1$K+!p|uVm{9R diff --git a/docs/source/downloads/extendLadybugTable.zip b/docs/source/downloads/extendLadybugTable.zip index f7e07044b1f4bd4699f0527ee1a00719d6da5523..4501d2723a2a6f2edbd2010f4ef7d8d57b1e5c60 100644 GIT binary patch delta 61 zcmdlduup(Dz?+#xgaHJW=02RO! ABme*a delta 61 zcmdlduup(Dz?+#xgaHI5O*NRv8_W!(HYPW)f#}K4*mA*i7`rE!Uc~MWrr)p!0RSHg B6NCT& diff --git a/docs/source/downloads/ladybug.zip b/docs/source/downloads/ladybug.zip index c33f9d222544f2726308a1ec6038d0246a10204c..d4b9c95a2814708b166087ecf06765fe65eec68b 100644 GIT binary patch delta 215 zcmaEr`YM$-z?+#xgaHJWbH z7BItJh6lp%Q_x}qi&U!#Gl3ZsHL@U#e_G05HIr5JkAP$*zt*<~)0zf0U^>IV6-;k1 qZ~)Vv4LrfLy&*)t&d?srKVS&a_s`G_%r`f(1Je~oMqqlaku3n{RY!^d delta 215 zcmaEr`YM$-z?+#xgaHI5O*PoayMdV*NN+yC?8gXZ2(r5IgBejGjbN$C_r!z10>%=Y zEMSJc3=f3ir=Z0K7O7SfW&$%NYGgqe|Fo3BY9_1b9|6fseywi}rZo+0z;uRzE12G3 q-~gsS8+d|gdqaqPouNILf4~r;@1LO=m~U=m2c|2GjKK6-BU=D`j7bUr diff --git a/docs/source/downloads/sandbox/v01.zip b/docs/source/downloads/sandbox/v01.zip index d3605ad38c993a55bd8e417c6c2561b745bb0796..440b053275e1d777f5b22dc11337b97e0331db78 100644 GIT binary patch delta 28 ecmbQhIDwHjz?+#xgaHJW% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +``` diff --git a/docs/source/snippets/Frank2Transactions/v510/async-config.txt b/docs/source/snippets/Frank2Transactions/v510/async-config.txt new file mode 100644 index 00000000..90c61bc5 --- /dev/null +++ b/docs/source/snippets/Frank2Transactions/v510/async-config.txt @@ -0,0 +1,58 @@ +.. code-block:: xml + :emphasize-lines: 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/source/snippets/Frank2Transactions/v510/docker-compose.md b/docs/source/snippets/Frank2Transactions/v510/docker-compose.md new file mode 100644 index 00000000..5b8be03f --- /dev/null +++ b/docs/source/snippets/Frank2Transactions/v510/docker-compose.md @@ -0,0 +1,24 @@ +```none{6, 7, 8, 9, 10, 18, 20, 21, 22} +services: + db: + image: private.docker.nexus.frankframework.org/ff-test/dbms/postgresql + ports: + - 5432:5432 + jms: + image: private.docker.nexus.frankframework.org/ff-test/mq/artemis + ports: + - 8160:8160 + - 61615:61615 + ff: + image: frankframework/frankframework:8.3.0-SNAPSHOT + ports: + - 8080:8080 + volumes: + - ./src/main/resources:/opt/frank/resources + environment: + jdbc.dbms.default: postgres-xa + jdbc.hostname: db + jms.hostname: jms + transactionmanager.type.default: NARAYANA + jms.createDestination: true +``` diff --git a/docs/source/snippets/Frank2Transactions/v510/docker-compose.txt b/docs/source/snippets/Frank2Transactions/v510/docker-compose.txt new file mode 100644 index 00000000..f8d60577 --- /dev/null +++ b/docs/source/snippets/Frank2Transactions/v510/docker-compose.txt @@ -0,0 +1,25 @@ +.. code-block:: none + :emphasize-lines: 6, 7, 8, 9, 10, 18, 20, 21, 22 + + services: + db: + image: private.docker.nexus.frankframework.org/ff-test/dbms/postgresql + ports: + - 5432:5432 + jms: + image: private.docker.nexus.frankframework.org/ff-test/mq/artemis + ports: + - 8160:8160 + - 61615:61615 + ff: + image: frankframework/frankframework:8.3.0-SNAPSHOT + ports: + - 8080:8080 + volumes: + - ./src/main/resources:/opt/frank/resources + environment: + jdbc.dbms.default: postgres-xa + jdbc.hostname: db + jms.hostname: jms + transactionmanager.type.default: NARAYANA + jms.createDestination: true diff --git a/docs/source/snippets/Frank2Transactions/v510/reference-queue.md b/docs/source/snippets/Frank2Transactions/v510/reference-queue.md new file mode 100644 index 00000000..3a8aa50b --- /dev/null +++ b/docs/source/snippets/Frank2Transactions/v510/reference-queue.md @@ -0,0 +1,14 @@ +```none{3, 8, 9, 10, 11, 12} +jdbc: + - name: "frank2transactions" + type: "org.postgresql.xa.PGXADataSource" + url: "jdbc:postgresql://${jdbc.hostname:-localhost}:5432/testiaf" + authalias: "${db.authalias}" + username: "testiaf_user" + password: "testiaf_user00" + +jms: + - name: "qcf-artemis" + type: "org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory" + url: "tcp://${jms.hostname:-localhost}:61615" +``` diff --git a/docs/source/snippets/Frank2Transactions/v510/reference-queue.txt b/docs/source/snippets/Frank2Transactions/v510/reference-queue.txt new file mode 100644 index 00000000..42206e30 --- /dev/null +++ b/docs/source/snippets/Frank2Transactions/v510/reference-queue.txt @@ -0,0 +1,15 @@ +.. code-block:: none + :emphasize-lines: 3, 8, 9, 10, 11, 12 + + jdbc: + - name: "frank2transactions" + type: "org.postgresql.xa.PGXADataSource" + url: "jdbc:postgresql://${jdbc.hostname:-localhost}:5432/testiaf" + authalias: "${db.authalias}" + username: "testiaf_user" + password: "testiaf_user00" + + jms: + - name: "qcf-artemis" + type: "org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory" + url: "tcp://${jms.hostname:-localhost}:61615" diff --git a/srcSteps/Frank2Transactions/v510/docker-compose.yml b/srcSteps/Frank2Transactions/v510/docker-compose.yml new file mode 100644 index 00000000..4ceae7f2 --- /dev/null +++ b/srcSteps/Frank2Transactions/v510/docker-compose.yml @@ -0,0 +1,22 @@ +services: + db: + image: private.docker.nexus.frankframework.org/ff-test/dbms/postgresql + ports: + - 5432:5432 + jms: + image: private.docker.nexus.frankframework.org/ff-test/mq/artemis + ports: + - 8160:8160 + - 61615:61615 + ff: + image: frankframework/frankframework:8.3.0-SNAPSHOT + ports: + - 8080:8080 + volumes: + - ./src/main/resources:/opt/frank/resources + environment: + jdbc.dbms.default: postgres-xa + jdbc.hostname: db + jms.hostname: jms + transactionmanager.type.default: NARAYANA + jms.createDestination: true diff --git a/srcSteps/Frank2Transactions/v510/meta.yml b/srcSteps/Frank2Transactions/v510/meta.yml new file mode 100644 index 00000000..d3a9096f --- /dev/null +++ b/srcSteps/Frank2Transactions/v510/meta.yml @@ -0,0 +1,47 @@ +- predecessor: v500 +- file: + path: docker-compose.yml + change: + - insert: 5 + highlight: true + snippet: docker-compose + - old: 1 + new: 1 + highlight: true + snippet: docker-compose + - insert: 3 + highlight: true + snippet: docker-compose +- file: + path: src/main/resources/Configuration.xml + change: + - old: 1 + new: 1 + highlight: true + snippet: async-config + - old: 1 + new: 12 + highlight: true + snippet: async-config +- file: + path: src/main/resources/resources.yml + change: + - old: 1 + new: 1 + highlight: true + snippet: reference-queue + - insert: 5 + highlight: true + snippet: reference-queue +- snippet: + name: docker-compose + markup: none + context: 50 +- snippet: + name: async-config + markup: xml + context: 50 +- snippet: + name: reference-queue + markup: none + context: 50 diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/Configuration.xml b/srcSteps/Frank2Transactions/v510/src/main/resources/Configuration.xml new file mode 100644 index 00000000..df6b44fc --- /dev/null +++ b/srcSteps/Frank2Transactions/v510/src/main/resources/Configuration.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/DatabaseChangelog.xml b/srcSteps/Frank2Transactions/v510/src/main/resources/DatabaseChangelog.xml new file mode 100644 index 00000000..75440cfa --- /dev/null +++ b/srcSteps/Frank2Transactions/v510/src/main/resources/DatabaseChangelog.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/DeploymentSpecifics.properties b/srcSteps/Frank2Transactions/v510/src/main/resources/DeploymentSpecifics.properties new file mode 100644 index 00000000..86abc0b4 --- /dev/null +++ b/srcSteps/Frank2Transactions/v510/src/main/resources/DeploymentSpecifics.properties @@ -0,0 +1,2 @@ +instance.name=Frank2Transactions +jdbc.migrator.active=true \ No newline at end of file diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/resources.yml b/srcSteps/Frank2Transactions/v510/src/main/resources/resources.yml new file mode 100644 index 00000000..f1be5773 --- /dev/null +++ b/srcSteps/Frank2Transactions/v510/src/main/resources/resources.yml @@ -0,0 +1,12 @@ +jdbc: + - name: "frank2transactions" + type: "org.postgresql.xa.PGXADataSource" + url: "jdbc:postgresql://${jdbc.hostname:-localhost}:5432/testiaf" + authalias: "${db.authalias}" + username: "testiaf_user" + password: "testiaf_user00" + +jms: + - name: "qcf-artemis" + type: "org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory" + url: "tcp://${jms.hostname:-localhost}:61615"