Sudwest-Fryslan · DelanoWAF · Jun 29, 2023 · Jun 30, 2023 · Jun 30, 2023 · Jun 30, 2023
diff --git a/.env.example b/.env.example
@@ -0,0 +1,4 @@
+VERSION=6
+PORT=8080
+
+jdbc.datasource.default=jdbc/webformulierenverwerker-postgresql
diff --git a/.github/workflows/writeBuildInfo.sh b/.github/workflows/writeBuildInfo.sh
@@ -6,6 +6,9 @@ if [[ -n $1 ]]; then
   echo "versionDate_ddmmyyyy=$(date +%d/%m/%Y)" >> classes/BuildInfo.properties
   echo "configuration.version=$1" > configurations/WebformulierenVerwerker/BuildInfo.properties
   echo "configuration.timestamp=$(date +%Y%m%d-%H%M%S)" >> configurations/WebformulierenVerwerker/BuildInfo.properties
+  export instance_version=$1
+  export versionDate_yyyymmdd=$(date +%Y-%m-%d)
+  envsubst < publiccode_template.yaml > publiccode.yaml
 else
   echo "writeBuildInfo.sh - no version to write, leaving BuildInfo.properties unchanged"
 fi
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ FrankConfig.xsd
 # .env should be made in the environment.
 # It is an additional file to StageSpecifics_LOC to keep it more generic.
 .env
+.idea/
diff --git a/.releaserc b/.releaserc
@@ -77,7 +77,9 @@
       {
         "assets": [
           "CHANGELOG.md",
-          "classes/BuildInfo.properties"
+          "classes/BuildInfo.properties",
+          "configurations/WebformulierenVerwerker/BuildInfo.properties",
+          "publiccode.yaml"
         ],
         "message": "chore(<%= nextRelease.type %>): release <%= nextRelease.version %> <%= nextRelease.channel !== null ? `on ${nextRelease.channel} channel ` : '' %>[skip ci]\n\n<%= nextRelease.notes %>"
       }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,136 @@
 [![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
 
+## [6.5.8](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.5.7...v6.5.8) (2023-07-05)
+
+
+### 🧑‍💻 Code Refactoring
+
+* add relationID to CreateMetaDocument ([f163e0b](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f163e0b3a56ae0841859de282d256674b50cbb9a))
+
+## [6.5.7](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.5.6...v6.5.7) (2023-07-04)
+
+
+### 🐛 Bug Fixes
+
+* connection pool shut down ([9944019](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/9944019960c893ce6d383d95010e5c5e983bc00e))
+
+## [6.5.6](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.5.5...v6.5.6) (2023-07-04)
+
+
+### 🧑‍💻 Code Refactoring
+
+* pipe path fix ([42c6fae](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/42c6faee55f276ce9f584be05fa77fee7dcce6c1))
+
+## [6.5.4](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.5.3...v6.5.4) (2023-07-04)
+
+
+### 🐛 Bug Fixes
+
+* incorrect XSLT element ([a390eae](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/a390eae9fde47b6cb2a49267fd9592357cfc54c2))
+
+## [6.5.2](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.5.1...v6.5.2) (2023-07-04)
+
+
+### 🐛 Bug Fixes
+
+* enable SOAP validation again ([#54](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/issues/54)) ([17ab996](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/17ab99662af4cbaa487abd690f18bb7eabf949dc))
+
+## [6.5.1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.5.0...v6.5.1) (2023-07-04)
+
+
+### 🧑‍💻 Code Refactoring
+
+* change object type for company registration ([6418228](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/64182285daac0e90f56ea3d237acb10b777564b8))
+* limit query to 1 result ([63fc149](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/63fc149a693181cb56e883acdb0e59ae35da4496))
+* skip pipes if no afzender ([6ac45c1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/6ac45c148ee472288d4cc5b9cbf5e88294de47c9))
+
+## [6.5.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.4.1...v6.5.0) (2023-07-03)
+
+
+### 🍕 Features
+
+* version publiccode.yaml automatically ([6e4864d](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/6e4864d0d59ec6daefbcebdca0ed850de495a7b3))
+
+
+### 🐛 Bug Fixes
+
+* check in publiccode.yaml ([a4c08d9](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/a4c08d961895d7c36ea2bd8fd7c6c8d44832a9d9))
+* CI/CD should check in configurations/WebformulierenVerwerker/BuildInfo.properties ([18da36a](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/18da36aebdeec700a121756b1e9142879b40e4de))
+
+
+### 📝 Documentation
+
+* update CONTRIBUTING.md ([11a3694](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/11a36948e0efeebdbed098699908f61abab6d6b4))
+
+## [6.4.1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.4.0...v6.4.1) (2023-07-03)
+
+
+### 🐛 Bug Fixes
+
+* add missing parameter ([efa742e](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/efa742e7f54e51a0473ff8c57ba237eed5de9ef2))
+
+## [6.4.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.3.5...v6.4.0) (2023-07-03)
+
+
+### 🍕 Features
+
+* add company registration to dispatcher ([d620003](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/d620003fd6f48b73d642284afcfea6dbf0237246))
+* add first iteration opslaanInkNietNatuurlijkPersoon ([84b9861](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/84b98612436ce211f31bf1703816665d40daf1bf))
+
+
+### 🐛 Bug Fixes
+
+* incorrect xslt variable ([2a42f41](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/2a42f418daf24e4d973c1cae5d622681c2f1863c))
+* renaming issues ([66ae9db](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/66ae9dbafefebf2722ed0c9b34787ad082bae63a))
+
+
+### 🧑‍💻 Code Refactoring
+
+* rename pipe SetONum ([29a2b22](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/29a2b220c2d58478b6837e79dcd14a364bee04e7))
+
+## [6.3.5](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.3.4...v6.3.5) (2023-07-02)
+
+
+### 🐛 Bug Fixes
+
+* Improve error handling ([#49](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/issues/49)) ([1fd3381](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/1fd338180bab1290a715b972c4159aa1244e2d6b))
+* sync custom code with latest ff ([#50](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/issues/50)) ([948a110](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/948a110bf47a84ff68a9479c7cd45042a195f9f4))
+
+## [6.3.4](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.3.3...v6.3.4) (2023-06-30)
+
+
+### 🐛 Bug Fixes
+
+* incorrect input for XSLTPipes ([832ed1f](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/832ed1f1a1c772010ef78001109c0081fdc94f78))
+
+## [6.3.3](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.3.2...v6.3.3) (2023-06-30)
+
+
+### 🧑‍💻 Code Refactoring
+
+* change sessionkey type ([e9fc89b](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/e9fc89ba9985bd7d3460aa7ed9b22e007d901755))
+
+## [6.3.2](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.3.1...v6.3.2) (2023-06-30)
+
+
+### 🧑‍💻 Code Refactoring
+
+* incorrect table name ([68096ea](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/68096ea7acd188c198cd89ec99b35bfb3f5e1fad))
+
+## [6.3.1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.3.0...v6.3.1) (2023-06-30)
+
+
+### 🧑‍💻 Code Refactoring
+
+* incorrect names and values ([5c9308e](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/5c9308e3bf27b426f5119d0e9cbe88c43e4803c3))
+
+## [6.3.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.14...v6.3.0) (2023-06-30)
+
+
+### 🍕 Features
+
+* re-use afzender & onderwerp ([6bb560e](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/6bb560eae45d396c94f876bde76065ef5c0c20a0))
+
 ## [6.2.14](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.13...v6.2.14) (2023-06-29)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,12 @@
+# Deliverables
+
+This project builds the following artifacts:
+* A docker image that can be used to run this application stand-alone.
+* A .jar file with only the Frank configuration of this project. The .jar file can be uploaded in het-integratie-platform, see https://github.com/wearefrank/het-integratie-platform. 
+
 # CI/CD
 
-Releases are created automatically by GitHub Actions, see [.github/workflows/ci-build.yml](.github/workflows/ci-build.yml).
+We use conventional commits, see https://www.conventionalcommits.org/en/v1.0.0/. Releases are created automatically by GitHub Actions, see [.github/workflows/ci-build.yml](.github/workflows/ci-build.yml).
 
 Please take care to write meaningful commit messages that result in meaningful entries in [CHANGELOG.md](CHANGELOG.md). Here is an example of the commit message for a breaking change:
 
@@ -19,19 +25,20 @@ A breaking change means that this version is not backwards compatible with the p
 * The commit type (e.g. chore) is still relevant for breaking changes. This information appears in the release notes in the same way as a non-breaking change.
 * For non-breaking changes, omit the line with BREAKING and make a commit message like the first line shown.
 
+# Checklist for testing CI/CD
 
 Here is a checklist for testing the CI/CD.
 
 * Testing goes best when you make hot fixes on the main branch. Check with the team that you are allowed to do this.
 * Do a commit on main that has a commit message starting with `fix:`. The following should happen:
   * The pipeline succeeds - this checks all authorizations are in place.
   * A commit with a message starting with `chore:` has been added automatically.
-  * The extra commit updates files `classes/BuildInfo.properties` and `CHANGELOG.md`.
+  * The extra commit updates files `classes/BuildInfo.properties`, `configurations/WebformulierenVerwerker/BuildInfo.properties`, `publiccode.yaml` and `CHANGELOG.md`.
   * These files should have trustworthy contents - speaks for itself.
   * On GitHub, there is a tag for the new version that starts with `v`. For example if the new release is `3.2.1` then the tag should be `v3.2.1`. You can get this tag using `git fetch origin` on the command line.
   * The docker image for the release has been created on http://www.dockerhub.com. The `latest` tag should have been updated - creation time should be the current time. Depending on the type of release, the `3.2.1`, the `3.2` or the `3` tags should be the current date.
   * Check on dockerhub that tags that should not have been updated do not have the current time as creation time.
-  * Run the docker image using `docker run -p 8080:8080 wearefrank/webformulierenverwerker:3.2.1`. Check the name of the docker container you started using `docker ps -a`. Login to the docker container using `docker exec -it <container name> bash`. Check that `/opt/frank/resources/BuildInfo.property` contains the right version and the right date.
+  * Run the docker image using `docker run -p 8080:8080 wearefrank/webformulierenverwerker:3.2.1`. Check the name of the docker container you started using `docker ps -a`. Login to the docker container using `docker exec -it <container name> bash`. Check that `/opt/frank/resources/BuildInfo.property` and `/opt/frank/configurations/WebformulierenVerwerker/BuildInfo.properties` contain the right version and the right date.
 * Check a breaking change like above. This should update the major version.
 * Do a commit with \[skip ci\] in the commit message. It should not make a release and it should not push a docker image.
 * Make a pull request. Check that no release is made and that no docker image is pushed.
diff --git a/Dockerfile b/Dockerfile
@@ -8,6 +8,7 @@ COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
 COPY --chown=tomcat java /tmp/java
 RUN javac \
       /tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
+      /tmp/java/nl/nn/adapterframework/http/HttpSessionBase.java \
       -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
       -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
 RUN rm -rf /tmp/java

diff --git a/README.md b/README.md
@@ -1,9 +1,5 @@
 # WebformulierenVerwerker
 
-Documentation can be found in Jira > Gemeente Team > [GT-36](https://wearefrank-devops.atlassian.net/browse/GT-36).
+Communicate between Kodison and Corsa. This configuration transforms incoming Kodison messages and makes them into Corsa requests. The responses are then transformed into messages accepted by Kodison.
 
-Please build docker image as follows:
-
-```
-docker build -t sudwestfryslan.nl/webformulierenverwerker .
-```
+This application processes SOAP requests that satisfy a WSDL that has been copied from the predecessor of this bridge. The WSDL is included in this project.
diff --git a/classes/BuildInfo.properties b/classes/BuildInfo.properties
@@ -1,2 +1,2 @@
-instance.version=6.2.14
-versionDate_ddmmyyyy=29/06/2023
+instance.version=6.5.8
+versionDate_ddmmyyyy=05/07/2023
diff --git a/configurations/WebformulierenVerwerker/BuildInfo.properties b/configurations/WebformulierenVerwerker/BuildInfo.properties
@@ -1,2 +1,2 @@
-configuration.version=6.1.7
-configuration.timestamp=20230626-145819
+configuration.version=6.5.8
+configuration.timestamp=20230705-073540