Have the code to explain XA and error store

frankframework · Sep 19, 2024 · 5837822 · 5837822
1 parent cd3148f
commit 5837822
Show file tree

Hide file tree

Showing 26 changed files with 380 additions and 0 deletions.
diff --git a/docs/source/downloads/advancedDevelopmentIntegrationPatternsMessageId.zip b/docs/source/downloads/advancedDevelopmentIntegrationPatternsMessageId.zip
diff --git a/docs/source/downloads/advancedDevelopmentProperties.zip b/docs/source/downloads/advancedDevelopmentProperties.zip
diff --git a/docs/source/downloads/configurations/NewHorizons.zip b/docs/source/downloads/configurations/NewHorizons.zip
diff --git a/docs/source/downloads/configurations/NewHorizonsDatabase.zip b/docs/source/downloads/configurations/NewHorizonsDatabase.zip
diff --git a/docs/source/downloads/configurations/NewHorizonsOnlyTableBooking.zip b/docs/source/downloads/configurations/NewHorizonsOnlyTableBooking.zip
diff --git a/docs/source/downloads/configurations/NewHorizonsValidate.zip b/docs/source/downloads/configurations/NewHorizonsValidate.zip
diff --git a/docs/source/downloads/configurations/credentials.zip b/docs/source/downloads/configurations/credentials.zip
diff --git a/docs/source/downloads/configurations/forFrankConsole.zip b/docs/source/downloads/configurations/forFrankConsole.zip
diff --git a/docs/source/downloads/configurations/forFrankConsole_2.zip b/docs/source/downloads/configurations/forFrankConsole_2.zip
diff --git a/docs/source/downloads/configurations/hermesBridge.zip b/docs/source/downloads/configurations/hermesBridge.zip
diff --git a/docs/source/downloads/deploymentTomcat.zip b/docs/source/downloads/deploymentTomcat.zip
diff --git a/docs/source/downloads/extendLadybugTable.zip b/docs/source/downloads/extendLadybugTable.zip
diff --git a/docs/source/downloads/ladybug.zip b/docs/source/downloads/ladybug.zip
diff --git a/docs/source/downloads/sandbox/v01.zip b/docs/source/downloads/sandbox/v01.zip
diff --git a/docs/source/snippets/Frank2Transactions/v510/async-config.md b/docs/source/snippets/Frank2Transactions/v510/async-config.md
@@ -0,0 +1,57 @@
+```xml{5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19}
+<Configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd"
+    >
+    <Adapter name="writeDbAsync">
+        <Receiver checkForDuplicates="true" processResultCacheSize="0" transactionAttribute="RequiresNew">
+            <ApiListener uriPattern="/write" method="POST" />
+            <JdbcMessageLog slotId="write-db-req"/>
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="enqueue">
+                <JmsSender name="enqueue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis"></JmsSender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+    <Adapter name="writeDb">
+        <Receiver transactionAttribute="RequiresNew" maxRetries="5">
+            <JmsListener name="dequeue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis" />
+            <JdbcErrorStorage slotId="write-db"/>
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="writeTableMessage">
+                <IbisLocalSender name="writeTableMessage" javaListener="writeTableMessage" />
+            </SenderPipe>
+            <EchoPipe name="originalMessage" getInputFromSessionKey="originalMessage" />
+            <SenderPipe name="writeTableOtherMessage">
+                <IbisLocalSender name="writeTableOtherMessage" javaListener="writeTableOtherMessage" />
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+    <Adapter name="writeTableMessage">
+        <Receiver transactionAttribute="Mandatory">
+            <JavaListener name="writeTableMessage" serviceName="writeTableMessage" />
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="writeTableMessage">
+                <FixedQuerySender query="INSERT INTO &quot;message&quot;(message) VALUES(?)">
+                    <Param name="message" type="string" defaultValueMethods="input" />
+                </FixedQuerySender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+    <Adapter name="writeTableOtherMessage">
+        <Receiver transactionAttribute="Mandatory">
+            <JavaListener name="writeTableOtherMessage" serviceName="writeTableOtherMessage" />
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="writeTableOtherMessage">
+                <FixedQuerySender query="INSERT INTO &quot;otherMessage&quot;(message) VALUES(?)">
+                    <Param name="message" type="string" defaultValueMethods="input" />
+                </FixedQuerySender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+</Configuration>
+```
diff --git a/docs/source/snippets/Frank2Transactions/v510/async-config.txt 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
+
+   <Configuration
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../FrankConfig.xsd"
+       >
+       <Adapter name="writeDbAsync">
+           <Receiver checkForDuplicates="true" processResultCacheSize="0" transactionAttribute="RequiresNew">
+               <ApiListener uriPattern="/write" method="POST" />
+               <JdbcMessageLog slotId="write-db-req"/>
+           </Receiver>
+           <Pipeline>
+               <SenderPipe name="enqueue">
+                   <JmsSender name="enqueue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis"></JmsSender>
+               </SenderPipe>
+           </Pipeline>
+       </Adapter>
+       <Adapter name="writeDb">
+           <Receiver transactionAttribute="RequiresNew" maxRetries="5">
+               <JmsListener name="dequeue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis" />
+               <JdbcErrorStorage slotId="write-db"/>
+           </Receiver>
+           <Pipeline>
+               <SenderPipe name="writeTableMessage">
+                   <IbisLocalSender name="writeTableMessage" javaListener="writeTableMessage" />
+               </SenderPipe>
+               <EchoPipe name="originalMessage" getInputFromSessionKey="originalMessage" />
+               <SenderPipe name="writeTableOtherMessage">
+                   <IbisLocalSender name="writeTableOtherMessage" javaListener="writeTableOtherMessage" />
+               </SenderPipe>
+           </Pipeline>
+       </Adapter>
+       <Adapter name="writeTableMessage">
+           <Receiver transactionAttribute="Mandatory">
+               <JavaListener name="writeTableMessage" serviceName="writeTableMessage" />
+           </Receiver>
+           <Pipeline>
+               <SenderPipe name="writeTableMessage">
+                   <FixedQuerySender query="INSERT INTO &quot;message&quot;(message) VALUES(?)">
+                       <Param name="message" type="string" defaultValueMethods="input" />
+                   </FixedQuerySender>
+               </SenderPipe>
+           </Pipeline>
+       </Adapter>
+       <Adapter name="writeTableOtherMessage">
+           <Receiver transactionAttribute="Mandatory">
+               <JavaListener name="writeTableOtherMessage" serviceName="writeTableOtherMessage" />
+           </Receiver>
+           <Pipeline>
+               <SenderPipe name="writeTableOtherMessage">
+                   <FixedQuerySender query="INSERT INTO &quot;otherMessage&quot;(message) VALUES(?)">
+                       <Param name="message" type="string" defaultValueMethods="input" />
+                   </FixedQuerySender>
+               </SenderPipe>
+           </Pipeline>
+       </Adapter>
+   </Configuration>
diff --git a/docs/source/snippets/Frank2Transactions/v510/docker-compose.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,55 @@
+<Configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd"
+    >
+    <Adapter name="writeDbAsync">
+        <Receiver checkForDuplicates="true" processResultCacheSize="0" transactionAttribute="RequiresNew">
+            <ApiListener uriPattern="/write" method="POST" />
+            <JdbcMessageLog slotId="write-db-req"/>
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="enqueue">
+                <JmsSender name="enqueue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis"></JmsSender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+    <Adapter name="writeDb">
+        <Receiver transactionAttribute="RequiresNew" maxRetries="5">
+            <JmsListener name="dequeue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis" />
+            <JdbcErrorStorage slotId="write-db"/>
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="writeTableMessage">
+                <IbisLocalSender name="writeTableMessage" javaListener="writeTableMessage" />
+            </SenderPipe>
+            <EchoPipe name="originalMessage" getInputFromSessionKey="originalMessage" />
+            <SenderPipe name="writeTableOtherMessage">
+                <IbisLocalSender name="writeTableOtherMessage" javaListener="writeTableOtherMessage" />
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+    <Adapter name="writeTableMessage">
+        <Receiver transactionAttribute="Mandatory">
+            <JavaListener name="writeTableMessage" serviceName="writeTableMessage" />
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="writeTableMessage">
+                <FixedQuerySender query="INSERT INTO &quot;message&quot;(message) VALUES(?)">
+                    <Param name="message" type="string" defaultValueMethods="input" />
+                </FixedQuerySender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+    <Adapter name="writeTableOtherMessage">
+        <Receiver transactionAttribute="Mandatory">
+            <JavaListener name="writeTableOtherMessage" serviceName="writeTableOtherMessage" />
+        </Receiver>
+        <Pipeline>
+            <SenderPipe name="writeTableOtherMessage">
+                <FixedQuerySender query="INSERT INTO &quot;otherMessage&quot;(message) VALUES(?)">
+                    <Param name="message" type="string" defaultValueMethods="input" />
+                </FixedQuerySender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+</Configuration>
diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/DatabaseChangelog.xml b/srcSteps/Frank2Transactions/v510/src/main/resources/DatabaseChangelog.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
+        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+    <changeSet id="1" author="martijn">
+        <createTable tableName="message">
+            <column name="id" type="int">  
+                <constraints  primaryKey="true" nullable="false"/>  
+            </column>
+            <column name="message" type="VARCHAR(30)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+	<changeSet id="2" author="liquibase-docs">
+        <addAutoIncrement
+            tableName="message"
+            columnDataType="int"
+            columnName="id"
+            incrementBy="1"
+            schemaName="public"
+            startWith="1"
+            />
+    </changeSet>
+    <changeSet id="3" author="martijn">
+        <createTable tableName="otherMessage">
+            <column name="id" type="int">  
+                <constraints  primaryKey="true" nullable="false"/>  
+            </column>
+            <column name="message" type="VARCHAR(30)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+	<changeSet id="4" author="liquibase-docs">
+        <addAutoIncrement
+            tableName="otherMessage"
+            columnDataType="int"
+            columnName="id"
+            incrementBy="1"
+            schemaName="public"
+            startWith="1"
+            />
+    </changeSet>
+</databaseChangeLog>
diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/DeploymentSpecifics.properties b/srcSteps/Frank2Transactions/v510/src/main/resources/DeploymentSpecifics.properties
@@ -0,0 +1,2 @@
+instance.name=Frank2Transactions
+jdbc.migrator.active=true
diff --git a/srcSteps/Frank2Transactions/v510/src/main/resources/resources.yml 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"