From daa893d10c1b0ef8ac59307336cb11a29fe34c3a Mon Sep 17 00:00:00 2001
From: latlon team <info@lat-lon.de>
Date: Mon, 22 Jul 2024 05:25:46 +0000
Subject: [PATCH] Code drop

- XPLANBOX-3061 - imporved describtion in readmes; fixed skipping of xplan-dokumente-api (caf8f4c21)
- XPLANBOX-3116 - Updated README.md (7475bc01c)
- XPLANBOX-3116 - Deleted Codelists TestSuite from xplan-manager-api-soapio-project.xml (12184b0d1)
- XPLANBOX-3116 - Copied Codelists TestSuite from xplan-manager-api-soapio-project.xml to xplan-webservices-soapui-project.xml (7a2e3bf5c)
- XPLANBOX-3061 - fixed password (d028c34d3)
- XPLANBOX-3061 - separated username/password (eced0e7e6)
- XPLANBOX-3061 - use ${#Project#usernameDokumenteApi}/${#Project#passwordDokumenteApi} (460c9811c)
- XPLANBOX-3116 - Credential changes for xplan-dokumente-api-soapui-project.xml (1a1b5b39e)
- XPLANBOX-3116 - Credential changes for xplan-webservices-soapui-project.xml (32eb96ccb)

Co-authored-by: Julian Zilz <zilz@lat-lon.de>
Co-authored-by: Lyn Elisa Goltz <goltz@lat-lon.de>

Dropped from commit: 5cf4c33db0ea648f8a2502d92b6082217e37505f
---
 jenkinsfiles/test.Jenkinsfile                 |  21 +-
 xplan-tests/xplan-tests-soapui/README.md      |  52 +-
 xplan-tests/xplan-tests-soapui/pom.xml        |  24 +
 .../xplan-tests-soapui/runAllSoapUiTests.sh   |  24 +-
 .../src/main/resources/README.md              |  63 +-
 .../xplan-dokumente-api-soapui-project.xml    | 163 ++-
 .../xplan-manager-api-soapui-project.xml      | 271 +----
 .../xplan-webservices-soapui-project.xml      | 970 ++++++++++++------
 .../plans/BP_5.2_externalCodelist.zip         | Bin
 9 files changed, 920 insertions(+), 668 deletions(-)
 rename xplan-tests/xplan-tests-soapui/src/main/resources/{xplan-manager-api => xplan-webservices}/plans/BP_5.2_externalCodelist.zip (100%)

diff --git a/jenkinsfiles/test.Jenkinsfile b/jenkinsfiles/test.Jenkinsfile
index 623ff7eef6..783068c56f 100644
--- a/jenkinsfiles/test.Jenkinsfile
+++ b/jenkinsfiles/test.Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
    parameters {
       string(name: 'BRANCH', defaultValue: "main", description: 'Set branch')
       string(name: 'CREDENTIALS_ID', defaultValue: "xplanbox.lat-lon.de", description: 'Set id of Jenkins credentials to login to environment (BASIC AUTH)')
-      string(name: 'SERVICES_API_KEY', defaultValue: "xplanbox", description: 'Set ApiKey to acces /config of XPlanDienste')
+      string(name: 'SERVICES_API_KEY', defaultValue: "xplanbox", description: 'Set ApiKey to access /config of XPlanDienste')
       string(name: 'ENDPOINT_VALIDATOR_API', defaultValue: "https://xplanbox.lat-lon.de/xvalidator/api/v1", description: 'Set endpoint of XPlanValidatorAPI')
       string(name: 'BASE_URL_DIENSTE', defaultValue: "https://xplanbox.lat-lon.de", description: 'Set base URL of XPlanDienste')
       string(name: 'BASE_URL_INSPIRE_PLU', defaultValue: "https://xplanbox.lat-lon.de", description: 'Set base URL of INSPIRE PLU')
@@ -32,7 +32,9 @@ pipeline {
             withCredentials([
                usernamePassword(credentialsId:"${CREDENTIALS_ID}", passwordVariable: 'Password', usernameVariable: 'Username')
             ]) {
-               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-manager-api-soapui-project.xml -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DbaseUrlServices=${BASE_URL_DIENSTE} -Dusername=$Username -Dpassword=$Password'
+               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-manager-api-soapui-project.xml \
+                      -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -Dusername=$Username -Dpassword=$Password \
+                      -DbaseUrlServices=${BASE_URL_DIENSTE} '
             }
          }
       }
@@ -41,7 +43,8 @@ pipeline {
             withCredentials([
                usernamePassword(credentialsId:"${CREDENTIALS_ID}", passwordVariable: 'Password', usernameVariable: 'Username')
             ]) {
-               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-validator-api-soapui-project.xml -Dendpoint=${ENDPOINT_VALIDATOR_API} -Dusername=$Username -Dpassword=$Password'
+               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-validator-api-soapui-project.xml \
+                       -Dendpoint=${ENDPOINT_VALIDATOR_API} -Dusername=$Username -Dpassword=$Password'
             }
          }
       }
@@ -50,7 +53,9 @@ pipeline {
             withCredentials([
                usernamePassword(credentialsId:"${CREDENTIALS_ID}", passwordVariable: 'Password', usernameVariable: 'Username')
             ]) {
-               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DbaseUrlDokumenteApi=${BASE_URL_DOKUMENTE_API} -Dusername=$Username -Dpassword=$Password'
+               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml \
+                   -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DusernameManagerApi=$Username -DpasswordManagerApi=$Password \
+                   -DbaseUrlDokumenteApi=${BASE_URL_DOKUMENTE_API} -DusernameDokumenteApi=$Username -DpasswordDokumenteApi=$Password'
             }
          }
       }
@@ -59,7 +64,13 @@ pipeline {
             withCredentials([
                usernamePassword(credentialsId:"${CREDENTIALS_ID}", passwordVariable: 'Password', usernameVariable: 'Username')
             ]) {
-               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=${BASE_URL_DIENSTE} -DbaseUrlInspirePlu=${BASE_URL_INSPIRE_PLU} -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DbaseUrlMapServer=${BASE_URL_MAPSERVER} -DbaseUrlMapProxy=${BASE_URL_MAPPROXY} -Dusername=$Username -Dpassword=$Password -DapiKey=${SERVICES_API_KEY}'
+               sh 'mvn test -pl :xplan-tests-soapui -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml \
+                  -DbaseUrlServices=${BASE_URL_DIENSTE} -DusernameServices=$Username -DpasswordServices=$Password \
+                  -DbaseUrlInspirePlu=${BASE_URL_INSPIRE_PLU} -DusernameInspirePlu=$Username -DpasswordInspirePlu=$Password \
+                  -DbaseUrlManagerApi=${BASE_URL_MANAGER_API} -DusernameManagerApi=$Username -DpasswordManagerApi=$Password \
+                  -DbaseUrlMapServer=${BASE_URL_MAPSERVER} -DusernameMapServer=$Username -DpasswordMapServer=$Password \
+                  -DbaseUrlMapProxy=${BASE_URL_MAPPROXY} -DusernameMapProxy=$Username -DpasswordMapProxy=$Password \
+                  -DapiKey=${SERVICES_API_KEY}'
             }
          }
       }
diff --git a/xplan-tests/xplan-tests-soapui/README.md b/xplan-tests/xplan-tests-soapui/README.md
index ad9f5721a0..b9686b6860 100644
--- a/xplan-tests/xplan-tests-soapui/README.md
+++ b/xplan-tests/xplan-tests-soapui/README.md
@@ -1,29 +1,59 @@
 # SoapUI TestSuites
 
+Details zu den einzelnen SoapUI TestSuites sind in der [README](src/main/resources/README.md) zu finden.
+
 ## Aufruf der SoapUI Tests mit mvn
 
 ### xplan-validator-api-soapui-project
 
 ```
-mvn clean test -Psystem-tests -DtestFileName=xplan-validator-api-soapui-project.xml -Dendpoint=https://xplanbox.lat-lon.de/xvalidator/api/v1 -Dusername=xplanbox -Dpassword='PWD'
+mvn clean test -Psystem-tests -DtestFileName=xplan-validator-api-soapui-project.xml \ 
+    -Dendpoint=https://xplanbox.lat-lon.de/xvalidator/api/v1 -Dusername=xplanbox -Dpassword='PWD'
 ```
 
 ### xplan-manager-api-soapui-project
 
 ```
-mvn clean test -Psystem-tests -DtestFileName=xplan-manager-api-soapui-project.xml -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlServices=https://xplanbox.lat-lon.de -DjdbcUrl=jdbc:postgresql://localhost:5433/xplanbox?user=xplanbox&password=xplanbox -Dusername=xplanbox -Dpassword='PWD'
+mvn clean test -Psystem-tests -DtestFileName=xplan-manager-api-soapui-project.xml \ 
+    -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD' \
+    -DbaseUrlServices=https://xplanbox.lat-lon.de \ 
+    -DjdbcUrl=jdbc:postgresql://localhost:5433/xplanbox?user=xplanbox&password=xplanbox
 ```
 
 ### xplan-dokumente-api-soapui-project
 
 ```
-mvn clean test -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlDokumenteApi=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD'
+mvn clean test -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml \
+    -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlDokumenteApi=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD'
+```
+Bei verschiedenen Zugangsdaten:
+```
+mvn clean test -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml \
+    -DbaseUrlManagerApi=https://xplanbox.lat-lon.de  -DusernameManagerApi=xplanbox -DpasswordManagerApi='PWD' \ 
+    -DbaseUrlDokumenteApi=https://xplanbox.lat-lon.de -DusernameDokumenteApi=xplanbox -DpasswordDokumenteApi='PWD'
 ```
 
 ### xplan-webservices-soapui-project
 
 ```
-mvn clean test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=https://xplanbox.lat-lon.de -DbaseUrlInspirePlu=https://xplanbox.lat-lon.de -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DbaseUrlMapServer=https://xplanbox.lat-lon.de -DbaseUrlMapProxy=https://xplanbox.lat-lon.de -Dusername=xplanbox -Dpassword='PWD'
+mvn clean test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml \
+    -DbaseUrlServices=https://xplanbox.lat-lon.de \
+    -DbaseUrlInspirePlu=https://xplanbox.lat-lon.de \
+    -DbaseUrlManagerApi=https://xplanbox.lat-lon.de \
+    -DbaseUrlMapServer=https://xplanbox.lat-lon.de \
+    -DbaseUrlMapProxy=https://xplanbox.lat-lon.de \
+    -Dusername=xplanbox -Dpassword='PWD' \
+    -DapiKey=xplanbox
+```
+Bei verschiedenen Zugangsdaten:
+```
+mvn clean test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml \
+    -DbaseUrlServices=https://xplanbox.lat-lon.de -DusernameServices=xplanbox -DpasswordServices='PWD' \
+    -DbaseUrlInspirePlu=https://xplanbox.lat-lon.de -DusernameInspirePlu=xplanbox -DpasswordInspirePlu='PWD' \
+    -DbaseUrlManagerApi=https://xplanbox.lat-lon.de -DusernameManagerApi=xplanbox -DpasswordManagerApi='PWD'\
+    -DbaseUrlMapServer=https://xplanbox.lat-lon.de -DusernameMapServer=xplanbox -DpasswordMapServer='PWD'\
+    -DbaseUrlMapProxy=https://xplanbox.lat-lon.de -DusernameMapProxy=xplanbox -DpasswordMapProxy='PWD' \
+    -DapiKey=xplanbox
 ```
 
 
@@ -38,13 +68,23 @@ docker run --env ... xplanbox/xplan-tests-soapui
 ### Umgebungsvariablen
 
 - `XPLAN_DIENSTE_BASE_URL`
-- `XPLAN_API_DOKUMENTE_BASE_URL` optional: XPlanDokumenteAPI Tests werden geskipped, wenn die Umgebungsvariable nicht gesetzt ist.
-- `XPLAN_INSPIRE_PLU_BASE_URL`
+- `XPLAN_DIENSTE_USERNAME`
+- `XPLAN_DIENSTE_PASSWORD`
+- `XPLAN_DOKUMENTE_API_BASE_URL` optional: XPlanDokumenteAPI Tests werden geskipped, wenn die Umgebungsvariable nicht gesetzt ist.
+- `XPLAN_DOKUMENTE_API_USERNAME`
+- `XPLAN_DOKUMENTE_API_PASSWORD`
+- `XPLAN_BASE_URL_INSPIRE_PLU`
+- `XPLAN_INSPIRE_PLU_USERNAME`
+- `XPLAN_INSPIRE_PLU_PASSWORD`
 - `XPLAN_MANAGER_API_BASE_URL`
 - `XPLAN_MANAGER_API_USERNAME`
 - `XPLAN_MANAGER_API_PASSWORD`
 - `XPLAN_MAPPROXY_BASE_URL`
+- `XPLAN_MAPPROXY_USERNAME`
+- `XPLAN_MAPPROXY_PASSWORD`
 - `XPLAN_MAPSERVER_BASE_URL`
+- `XPLAN_MAPSERVER_USERNAME`
+- `XPLAN_MAPSERVER_PASSWORD`
 - `XPLAN_SERVICES_API_KEY`
 - `XPLAN_VALIDATOR_API_BASE_URL`
 
diff --git a/xplan-tests/xplan-tests-soapui/pom.xml b/xplan-tests/xplan-tests-soapui/pom.xml
index 446b65a5db..19c0007390 100644
--- a/xplan-tests/xplan-tests-soapui/pom.xml
+++ b/xplan-tests/xplan-tests-soapui/pom.xml
@@ -51,11 +51,23 @@
       <properties>
         <testFileName />
         <baseUrlInspirePlu />
+        <usernameInspirePlu />
+        <passwordInspirePlu />
         <baseUrlManagerApi />
+        <usernameManagerApi />
+        <passwordManagerApi />
         <baseUrlDokumenteApi />
+        <usernameDokumenteApi />
+        <passwordDokumenteApi />
         <baseUrlServices />
+        <usernameServices />
+        <passwordServices />
         <baseUrlMapServer />
+        <usernameMapServer />
+        <passwordMapServer />
         <baseUrlMapProxy />
+        <usernameMapProxy />
+        <passwordMapProxy />
         <username />
         <password />
         <apiKey />
@@ -98,11 +110,23 @@
                   <projectProperties>
                     <projectProperty>projectDir=${basedir}/src/main/resources</projectProperty>
                     <value>baseUrlInspirePlu=${baseUrlInspirePlu}</value>
+                    <value>usernameInspirePlu=${usernameInspirePlu}</value>
+                    <value>passwordInspirePlu=${passwordInspirePlu}</value>
                     <value>baseUrlManagerApi=${baseUrlManagerApi}</value>
+                    <value>usernameManagerApi=${usernameManagerApi}</value>
+                    <value>passwordManagerApi=${passwordManagerApi}</value>
                     <value>baseUrlDokumenteApi=${baseUrlDokumenteApi}</value>
+                    <value>usernameDokumenteApi=${usernameDokumenteApi}</value>
+                    <value>passwordDokumenteApi=${passwordDokumenteApi}</value>
                     <value>baseUrlServices=${baseUrlServices}</value>
+                    <value>usernameServices=${usernameServices}</value>
+                    <value>passwordServices=${passwordServices}</value>
                     <value>baseUrlMapServer=${baseUrlMapServer}</value>
+                    <value>usernameMapServer=${usernameMapServer}</value>
+                    <value>passwordMapServer=${passwordMapServer}</value>
                     <value>baseUrlMapProxy=${baseUrlMapProxy}</value>
+                    <value>usernameMapProxy=${usernameMapProxy}</value>
+                    <value>passwordMapProxy=${passwordMapProxy}</value>
                     <value>username=${username}</value>
                     <value>password=${password}</value>
                     <value>apiKey=${apiKey}</value>
diff --git a/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh b/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
index ea48aa081b..ae69ef7ebd 100755
--- a/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
+++ b/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
@@ -61,21 +61,33 @@ for url in $urlsToCheck; do
 	waitForRightVersion $url
 done;
 
-
 echo "Executing tests..."
-mvn test -Psystem-tests -DtestFileName=xplan-manager-api-soapui-project.xml -DbaseUrlManagerApi=$XPLAN_MANAGER_API_BASE_URL -DbaseUrlServices=$XPLAN_DIENSTE_BASE_URL -DjdbcUrl=$JDBC_URL -Dusername=$XPLAN_MANAGER_API_USERNAME -Dpassword=$XPLAN_MANAGER_API_PASSWORD
+mvn test -Psystem-tests -DtestFileName=xplan-manager-api-soapui-project.xml \
+    -DbaseUrlManagerApi=$XPLAN_MANAGER_API_BASE_URL \
+    -Dusername=$XPLAN_MANAGER_API_USERNAME -Dpassword=$XPLAN_MANAGER_API_PASSWORD \
+    -DbaseUrlServices=$XPLAN_DIENSTE_BASE_URL \
+    -DjdbcUrl=$JDBC_URL
 
-mvn test -Psystem-tests -DtestFileName=xplan-validator-api-soapui-project.xml -Dendpoint=$XPLAN_VALIDATOR_API_BASE_URL/xvalidator/api/v1 -Dusername=$XPLAN_VALIDATOR_API_USERNAME -Dpassword=$XPLAN_VALIDATOR_API_PASSWORD
+mvn test -Psystem-tests -DtestFileName=xplan-validator-api-soapui-project.xml \
+    -Dendpoint=$XPLAN_VALIDATOR_API_BASE_URL/xvalidator/api/v1 -Dusername=$XPLAN_VALIDATOR_API_USERNAME -Dpassword=$XPLAN_VALIDATOR_API_PASSWORD
 
-if [ -z ${XPLAN_API_DOKUMENTE_BASE_URL+x} ];
+if [ -z ${XPLAN_DOKUMENTE_API_BASE_URL+x} ];
 then
 	echo "XPlanDokumenteAPI Tests are skipped!"
 else
 	waitForRightVersion $XPLAN_DOKUMENTE_API_BASE_URL/xdokumente/version.txt
-	mvn test -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml -DbaseUrlManagerApi=$XPLAN_MANAGER_API_BASE_URL -DbaseUrlDokumenteApi=$XPLAN_DOKUMENTE_API_BASE_URL -Dusername=$XPLAN_MANAGER_API_USERNAME -Dpassword=$XPLAN_MANAGER_API_PASSWORD
+	mvn test -Psystem-tests -DtestFileName=xplan-dokumente-api-soapui-project.xml \
+	    -DbaseUrlManagerApi=$XPLAN_MANAGER_API_BASE_URL -DusernameManagerApi=$XPLAN_MANAGER_API_USERNAME -DpasswordManagerApi=$XPLAN_MANAGER_API_PASSWORD \
+	    -DbaseUrlDokumenteApi=$XPLAN_DOKUMENTE_API_BASE_URL -DusernameDokumenteApi=$XPLAN_DOKUMENTE_API_USERNAME -DpasswordDokumenteApi=$XPLAN_DOKUMENTE_API_PASSWORD
 fi
 
-mvn test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml -DbaseUrlServices=${XPLAN_DIENSTE_BASE_URL} -DbaseUrlInspirePlu=${XPLAN_BASE_URL_INSPIRE_PLU} -DbaseUrlManagerApi=${XPLAN_MANAGER_API_BASE_URL} -DbaseUrlMapServer=${XPLAN_MAPSERVER_BASE_URL} -DbaseUrlMapProxy=${XPLAN_MAPPROXY_BASE_URL} -Dusername=$XPLAN_MANAGER_API_USERNAME -Dpassword=$XPLAN_MANAGER_API_PASSWORD -DapiKey=$XPLAN_SERVICES_API_KEY
+mvn test -Psystem-tests -DtestFileName=xplan-webservices-soapui-project.xml \
+    -DbaseUrlServices=${XPLAN_DIENSTE_BASE_URL} -DusernameServices=$XPLAN_DIENSTE_USERNAME -DpasswordServices=$XPLAN_DIENSTE_PASSWORD \
+    -DbaseUrlInspirePlu=${XPLAN_BASE_URL_INSPIRE_PLU} -DusernameInspirePlu=$XPLAN_INSPIRE_PLU_USERNAME -DpasswordInspirePlu=$XPLAN_INSPIRE_PLU_PASSWORD \
+    -DbaseUrlManagerApi=${XPLAN_MANAGER_API_BASE_URL} -DusernameManagerApi=$XPLAN_MANAGER_API_USERNAME -DpasswordManagerApi=$XPLAN_MANAGER_API_PASSWORD \
+    -DbaseUrlMapServer=${XPLAN_MAPSERVER_BASE_URL} -DusernameMapServer=$XPLAN_MAPSERVER_USERNAME -DpasswordMapServer=$XPLAN_MAPSERVER_PASSWORD \
+    -DbaseUrlMapProxy=${XPLAN_MAPPROXY_BASE_URL} -DusernameMapProxy=$XPLAN_MAPPROXY_USERNAME -DpasswordMapProxy=$XPLAN_MAPPROXY_PASSWORD \
+    -DapiKey=$XPLAN_SERVICES_API_KEY
 
 echo -e "\n"
 echo "Results:"
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/README.md b/xplan-tests/xplan-tests-soapui/src/main/resources/README.md
index 111a2b7171..66f76d6148 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/README.md
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/README.md
@@ -38,23 +38,6 @@ Beispiel für eine JDBC URL: `jdbc:postgresql://localhost:5433/xplanbox?user=xpl
 
 Wenn keine JDBC URL konfiguriert ist, werden die Datenbanktests übersprungen.
 
-#### TestSuite "Codelists TestSuite"
-
-Diese TestSuite prüft, ob externe Codelisten beim Import über die XPlanManagerAPI übersetzt werden. Es werden per Default folgende Übersetzungen angenommen:
-* BP_SonstPlanArt, Code 11002 => TeilbebauungsPlan
-* BP_Status, Code 19999 => 19999
-
-Um diesen Zustand zu erreichen, ist eine entsprechende Konfiguration der externen Codeliste **BP_SonstPlanArt** für die XPlanGML Version 5.2 in der Installation der XPlanManagerAPI notwendig. Für die Codeliste **BP_Status** wird angenommen, dass **keine** externe Codeliste konfiguriert ist.
-
-Die default Werte können durch Auswahl der TestSuite und Öffnen des Reiters `Custom Properties` (unten links) angepasst werden. Es handelt sich um folgende Properties:
-* codelistValue_BP_SonstPlanArt_11002
-* codelistValue_BP_Status_19999
-
-Für die Ausführung ist auch die Konfiguration der XPlanDienste URL erforderlich. Dies erfolgt durch Auswahl des Projekts und Öffnen des Reiters `Custom Properties` (unten links). Dort sind folgende Properties anzupassen:
-* servicesBaseUrl
-* username (optional)
-* password (optional)
-
 ### xplan-validator-api Projekt
 
 Dieses SoapUI Projekt testet die Komponente XPlanValidatorAPI.
@@ -65,19 +48,61 @@ Die Ausführung des SoapUI Projekt erfolgt, wie in dem [xplan-manager-api Projek
 
 Dieses SoapUI Projekt testet die Komponente XPlanDokumenteAPI.
 
-Die Ausführung des SoapUI Projekt erfolgt, wie in dem [xplan-manager-api Projekt](#xplan-manager-api-projekt) beschrieben. Es gelten auch die dort beschriebenen Hinweise.
+Die zu testenden Endpunkte können folgendermaßen geändert werden:
+
+1. Projekt in SoapUI laden.
+2. Projekt auswählen.
+3. Reiter `Custom Properties` öffnen (unten links).
+4. Dort aufgelistete Parameterwerte auf die zu testende Umgebung anpassen.
+   * Wenn alle der zu testenden Umgebungen die gleichen Zugangsdaten haben müssen vor Ausführung nur die Parameterwerte für `username` und `password` angepasst werden. Die gesetzten Zugangsdaten werden dann automatisch auf die anderen Parameterwerte übertragen (Testuite "Authorization-Setup").
+   * Werden für die verschiedenen Umgebungen unterschiedliche Zugangsdaten erwartet, müssen die Parameterwerte für `username` und `password` leer gelassen werden und die Zugangsdaten der XPlanDokumenteAPI (`usernameDokumenteApi` und `passwordDokumenteApi`) und XPlanManagerAPI (`usernameManagerApi` und `passwordManagerApi`) einzeln gesetzt werden.
+   * Weitere Hinweise zu den einzelnen Parametern gibt es, wenn das Projekt geöffnet wird, `Overview` und anschließend `Description` (ganz unten) ausgewählt werden.
+5. Anschließend können die verschiedenen TestSuites über die üblichen Wege ausgeführt werden.
+
+Es gelten auch die in [xplan-manager-api Projekt](#xplan-manager-api-projekt) beschriebenen Hinweise.
 
 ### xplan-webservices Projekt
 
 Dieses SoapUI Projekt testet die Komponente XPlanDienste.
 
-Die Ausführung des SoapUI Projekt erfolgt, wie in dem [xplan-manager-api Projekt](#xplan-manager-api-projekt) beschrieben. Es gelten auch die dort beschriebenen Hinweise.
+Die zu testenden Endpunkte können folgendermaßen geändert werden:
+
+1. Projekt in SoapUI laden.
+2. Projekt auswählen.
+3. Reiter `Custom Properties` öffnen (unten links).
+4. Dort aufgelistete Parameterwerte auf die zu testende Umgebung anpassen.
+   * Wenn alle der zu testenden Umgebungen die gleichen Zugangsdaten haben müssen vor Ausführung nur die Parameterwerte für `username` und `password` angepasst werden. Die gesetzten Zugangsdaten werden dann automatisch auf die anderen Parameterwerte übertragen (Testuite "Authorization-Setup").
+   * Werden für die verschiedenen Umgebungen unterschiedliche Zugangsdaten erwartet, müssen die Parameterwerte für `username` und `password` leer gelassen werden und die Zugangsdaten der XPlanDienst (`usernameServicesApi` und `passwordServicesApi`), XPlanManagerAPI (`usernameManagerApi` und `passwordManagerApi`), XPlanInspirePluDienste (`usernameInspirePlu` und `passwordInspirePlu`), MapServer (`usernameMapServer` und `passwordMapServer`) und MapProxy (`usernameMapProxy` und `passwordMapProxy`) einzeln gesetzt werden.
+   * Weitere Hinweise zu den einzelnen Parametern gibt es, wenn das Projekt geöffnet wird, `Overview` und anschließend `Description` (ganz unten) ausgewählt werden.
+5. Anschließend können die verschiedenen TestSuites über die üblichen Wege ausgeführt werden.
 
 ***Hinweise***
 
 - Die TestCases aller TestSuites können individuell genutzt werden und es gibt keine Abhängigkeiten zwischen diesen. Nur die einzelnen TestSteps bauen teilweise aufeinander auf.
 - Das SoapUI Projekt kann gegen eine frische Installation ausgeführt werden, welche keinerlei Daten beinhaltet. Somit eignet sich diese zum Verifizieren einer Neuinstallation.
 
+#### TestSuite "Codelists TestSuite"
+
+Diese TestSuite prüft, ob externe Codelisten beim Import über die XPlanManagerAPI übersetzt werden. Es werden per Default folgende Übersetzungen angenommen:
+* BP_SonstPlanArt, Code 11002 => TeilbebauungsPlan
+* BP_Status, Code 19999 => 19999
+
+Um diesen Zustand zu erreichen, ist eine entsprechende Konfiguration der externen Codeliste **BP_SonstPlanArt** für die XPlanGML Version 5.2 in der Installation der XPlanManagerAPI notwendig. Für die Codeliste **BP_Status** wird angenommen, dass **keine** externe Codeliste konfiguriert ist.
+
+Die default Werte können durch Auswahl der TestSuite und Öffnen des Reiters `Custom Properties` (unten links) angepasst werden. Es handelt sich um folgende Properties:
+* codelistValue_BP_SonstPlanArt_11002
+* codelistValue_BP_Status_19999
+
+Für die Ausführung ist auch die Konfiguration der XPlanDienste URL erforderlich. Dies erfolgt durch Auswahl des Projekts und Öffnen des Reiters `Custom Properties` (unten links). Dort sind je nach den zu testenden Umgebungen folgende Properties anzupassen:
+* servicesBaseUrl
+* baseUrlManagerApi
+* username (optional)
+* password (optional)
+* usernameServices (optional)
+* passwordServices (optional)
+* usernameManagerApi (optional)
+* passwordManagerApi (optional)
+
 ### xplan-manager-web Projekt
 
 Dieses SoapUI Projekt testet Teile der REST API des XPlanManagerWeb.
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-dokumente-api-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-dokumente-api-soapui-project.xml
index 180b9c5d37..4b07c3b974 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-dokumente-api-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-dokumente-api-soapui-project.xml
@@ -75,8 +75,8 @@ List documents</con:description>
           <con:endpoint>${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
           <con:request/>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameDokumenteApi}</con:username>
+            <con:password>${#Project#passwordDokumenteApi}</con:password>
             <con:domain xsi:nil="true"/>
           </con:credentials>
           <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
@@ -113,8 +113,8 @@ Show system and application configuration</con:description>
           <con:endpoint>${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
           <con:request/>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameDokumenteApi}</con:username>
+            <con:password>${#Project#passwordDokumenteApi}</con:password>
             <con:domain xsi:nil="true"/>
           </con:credentials>
           <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
@@ -185,8 +185,8 @@ Download document</con:description>
           <con:endpoint>${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
           <con:request/>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameDokumenteApi}</con:username>
+            <con:password>${#Project#passwordDokumenteApi}</con:password>
             <con:domain xsi:nil="true"/>
           </con:credentials>
           <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
@@ -388,13 +388,19 @@ Download document</con:description>
           <con:params/>
           <con:element>data</con:element>
         </con:representation>
+        <con:representation type="RESPONSE">
+          <con:mediaType xsi:nil="true"/>
+          <con:status>200</con:status>
+          <con:params/>
+          <con:element>data</con:element>
+        </con:representation>
         <con:request name="Request 1" id="5f17e7fb-0b2d-42db-b32a-d5ea636607a2" mediaType="application/json">
           <con:settings/>
           <con:endpoint>${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
           <con:request/>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameDokumenteApi}</con:username>
+            <con:password>${#Project#passwordDokumenteApi}</con:password>
             <con:domain xsi:nil="true"/>
             <con:authType>No Authorization</con:authType>
           </con:credentials>
@@ -433,8 +439,8 @@ OpenAPI document</con:description>
           <con:endpoint>${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
           <con:request/>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameDokumenteApi}</con:username>
+            <con:password>${#Project#passwordDokumenteApi}</con:password>
             <con:domain xsi:nil="true"/>
           </con:credentials>
           <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
@@ -443,6 +449,40 @@ OpenAPI document</con:description>
       </con:method>
     </con:resource>
   </con:interface>
+  <con:testSuite id="d3d56f16-d37b-417e-b819-952ce0ea9a56" name="Authorization-Setup">
+    <con:settings/>
+    <con:runType>SEQUENTIAL</con:runType>
+    <con:testCase id="99bcd57f-82b2-4034-abc7-db29a0927413" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Set Credentials" searchProperties="true">
+      <con:settings/>
+      <con:testStep type="groovy" name="Groovy Script" id="f9db5173-9a91-4c93-a225-98fb9deb584e">
+        <con:settings/>
+        <con:config>
+          <script>// Get the project from the testRunner
+def project = testRunner.testCase.testSuite.project
+
+// Get the values of the custom properties "username" and "password" (credentials)
+def username = project.getPropertyValue("username")
+def password = project.getPropertyValue("password")
+
+// Check if "username" and "password" are not empty
+if (username &amp;&amp; password) {
+    // If they are not empty, assign the values to the other custom properties (credentials)
+    		//XPlanDokumenteAPI
+    project.setPropertyValue("usernameDokumenteApi", username)
+    project.setPropertyValue("passwordDokumenteApi", password)
+    		//XPlanManagerAPI
+    project.setPropertyValue("usernameManagerApi", username)
+    project.setPropertyValue("passwordManagerApi", password)
+} else {
+    // Log a message if either "username" or "password" is empty
+    log.info "No value set for Username and/or Password. Therefore they are not set for the other custom properties (credentials)."
+}</script>
+        </con:config>
+      </con:testStep>
+      <con:properties/>
+    </con:testCase>
+    <con:properties/>
+  </con:testSuite>
   <con:testSuite id="93c38a1c-7e2a-4fc9-b84d-7b26405954f7" name="XPlanDokumenteAPI TestSuite">
     <con:description>TestSuite generated for REST Service [XPlanDokumenteAPI]</con:description>
     <con:settings/>
@@ -454,6 +494,7 @@ OpenAPI document</con:description>
         <con:config method="POST" xsi:type="con:HttpRequest" id="11bcd378-8420-40fd-a2de-2e56a2944269" name="POST BP 6.0 importPlan" postQueryString="false" mediaType="application/octet-stream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1/plan</con:endpoint>
           <con:request/>
@@ -463,8 +504,8 @@ OpenAPI document</con:description>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -564,8 +605,8 @@ OpenAPI document</con:description>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -591,8 +632,8 @@ OpenAPI document</con:description>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -642,8 +683,8 @@ assert json.version != null</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -669,8 +710,8 @@ assert json.version != null</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -728,8 +769,8 @@ assert json.version != null</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -757,8 +798,8 @@ assert json.version != null</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -786,8 +827,8 @@ assert json.version != null</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -835,8 +876,8 @@ assert contentLength[0].toInteger() == 67450</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -880,8 +921,8 @@ assert contentLength[0].toInteger() == 320960</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -925,8 +966,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -955,8 +996,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -985,8 +1026,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1015,8 +1056,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1067,8 +1108,8 @@ assert contentLength[0].toInteger() == 67450</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1119,8 +1160,8 @@ assert contentLength[0].toInteger() == 320960</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1164,8 +1205,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1194,8 +1235,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1224,8 +1265,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1254,8 +1295,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
               </con:configuration>
             </con:assertion>
             <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
+              <con:username>${#Project#usernameDokumenteApi}</con:username>
+              <con:password>${#Project#passwordDokumenteApi}</con:password>
               <con:domain xsi:nil="true"/>
               <con:authType>No Authorization</con:authType>
             </con:credentials>
@@ -1286,8 +1327,8 @@ assert contentLength[0].toInteger() == 73</scriptText>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -1332,7 +1373,7 @@ assert contentLength[0].toInteger() == 73</scriptText>
     </con:properties>
   </con:testSuite>
   <con:endpointStrategy xsi:type="con:DefaultEndpointStrategy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <con:endpoint mode="COMPLEMENT" password="${#Project#password}" username="${#Project#username}">${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
+    <con:endpoint mode="COMPLEMENT" password="${#Project#passwordDokumenteApi}" username="${#Project#usernameDokumenteApi}">${#Project#baseUrlDokumenteApi}/xdokumente/api/v1</con:endpoint>
   </con:endpointStrategy>
   <con:properties>
     <con:property>
@@ -1351,6 +1392,22 @@ assert contentLength[0].toInteger() == 73</scriptText>
       <con:name>password</con:name>
       <con:value/>
     </con:property>
+    <con:property>
+      <con:name>usernameDokumenteApi</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordDokumenteApi</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>usernameManagerApi</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordManagerApi</con:name>
+      <con:value/>
+    </con:property>
   </con:properties>
   <con:wssContainer/>
   <con:oAuth2ProfileContainer/>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml
index 9511ae2364..b41a5ee623 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml
@@ -58,6 +58,12 @@ OpenAPI document</con:description>
           <con:params/>
           <con:element>html</con:element>
         </con:representation>
+        <con:representation type="RESPONSE">
+          <con:mediaType xsi:nil="true"/>
+          <con:status>0</con:status>
+          <con:params/>
+          <con:element>data</con:element>
+        </con:representation>
         <con:request name="Request 1" id="e8223f9a-1c6b-40dd-b28d-ce2681af9b55" mediaType="application/json">
           <con:settings/>
           <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
@@ -204,7 +210,7 @@ Import the plan</con:description>
         </con:representation>
         <con:representation type="FAULT">
           <con:mediaType>application/json</con:mediaType>
-          <con:status>400 406</con:status>
+          <con:status>400 406 415</con:status>
           <con:params/>
           <con:element xmlns:plan="http://localhost/xplan-manager-api/xmanager/api/v1/plan">plan:Fault</con:element>
         </con:representation>
@@ -3893,7 +3899,7 @@ assert actualHeader != null</scriptText>
       <con:testStep type="restrequest" name="POST BP 6.0 XX importPlanWithGeoTiff" id="26db5d29-a1cc-447e-a2a0-7bf0f594bc4c">
         <con:settings/>
         <con:config service="XPlanManagerAPI" resourcePath="/plan" methodName="import" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:restRequest name="Copy of POST BP 6.0 XX importPlanWithGeoTiff" id="bf7971d6-e318-4bdc-b279-2bb920237af7" mediaType="application/octet-stream" postQueryString="false">
+          <con:restRequest name="POST BP 6.0 XX importPlanWithGeoTiff" id="bf7971d6-e318-4bdc-b279-2bb920237af7" mediaType="application/octet-stream" postQueryString="false">
             <con:settings>
               <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;entry key="Accept" value="application/json" xmlns="http://eviware.com/soapui/config"/></con:setting>
             </con:settings>
@@ -18413,267 +18419,6 @@ assert expectedHeader == actualHeader</scriptText>
       </con:property>
     </con:properties>
   </con:testSuite>
-  <con:testSuite id="184b8268-04e3-4e5f-aada-51f5ef02a8e0" name="Codelists TestSuite">
-    <con:settings/>
-    <con:runType>SEQUENTIAL</con:runType>
-    <con:testCase id="7ddf4a83-e781-4a5f-b79c-207d8863e2f5" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="externalCodelists" searchProperties="true">
-      <con:settings/>
-      <con:testStep type="restrequest" name="POST BP 5.2 XX importPlan" id="b8841eb1-28e7-465a-acf5-440c535f36cf">
-        <con:settings/>
-        <con:config service="XPlanManagerAPI" resourcePath="/plan" methodName="import" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:restRequest name="POST BP 5.2 XX importPlan" id="0ab9bfa6-1c76-41df-b253-dabff57568f7" mediaType="application/octet-stream" postQueryString="false">
-            <con:settings>
-              <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
-            </con:settings>
-            <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
-            <con:request/>
-            <con:originalUri>http://localhost/xplan-manager-api/xmanager/api/v1/plan</con:originalUri>
-            <con:assertion type="Valid HTTP Status Codes" id="c2c8dc24-bb2c-4f7e-b3e7-98d1fd03413b" name="Valid HTTP Status Codes">
-              <con:configuration>
-                <codes>201</codes>
-              </con:configuration>
-            </con:assertion>
-            <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
-              <con:domain xsi:nil="true"/>
-              <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
-              <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
-              <con:preemptive>true</con:preemptive>
-              <con:authType>Preemptive</con:authType>
-            </con:credentials>
-            <con:attachment>
-              <con:name>BP_5.2_externalCodelist.zip</con:name>
-              <con:contentType>application/octet-stream</con:contentType>
-              <con:contentId>BP_5.2_externalCodelist.zip</con:contentId>
-              <con:url>${projectDir}/xplan-manager-api/plans/BP_5.2_externalCodelist.zip</con:url>
-              <con:id>3f5a10c0-777b-4dc6-b2ce-44fcd9a8126e</con:id>
-            </con:attachment>
-            <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
-            <con:jmsPropertyConfig/>
-            <con:parameters>
-              <con:entry key="profiles" value=""/>
-              <con:entry key="X-Filename" value="BP_5.2_externalCodelist.zip"/>
-            </con:parameters>
-            <con:parameterOrder>
-              <con:entry>X-Filename</con:entry>
-              <con:entry>skipSemantisch</con:entry>
-              <con:entry>skipFlaechenschluss</con:entry>
-              <con:entry>skipGeltungsbereich</con:entry>
-              <con:entry>internalId</con:entry>
-              <con:entry>planStatus</con:entry>
-              <con:entry>skipLaufrichtung</con:entry>
-              <con:entry>profiles</con:entry>
-            </con:parameterOrder>
-          </con:restRequest>
-        </con:config>
-      </con:testStep>
-      <con:testStep type="transfer" name="Property Transfer" id="5fa0e4f9-77e5-436c-a0b1-23d863d7b9ab">
-        <con:settings/>
-        <con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false">
-            <con:name>planId</con:name>
-            <con:sourceType>Response</con:sourceType>
-            <con:sourceStep>POST BP 5.2 XX importPlan</con:sourceStep>
-            <con:sourcePath>$.id</con:sourcePath>
-            <con:targetType>planId</con:targetType>
-            <con:targetStep>#TestCase#</con:targetStep>
-            <con:type>JSONPATH</con:type>
-            <con:targetTransferType>JSONPATH</con:targetTransferType>
-            <con:upgraded>true</con:upgraded>
-          </con:transfers>
-        </con:config>
-      </con:testStep>
-      <con:testStep type="httprequest" name="GetFeatureByPlanNameAndType" id="a7d01717-deea-4149-9df2-ad347ffb75f0">
-        <con:settings/>
-        <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="GetFeatureByPlanNameAndType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:settings>
-            <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
-          </con:settings>
-          <con:endpoint>${#Project#baseUrlServices}/xplansyn-wfs/services/xplansynwfs</con:endpoint>
-          <con:request/>
-          <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes">
-            <con:configuration>
-              <codes>200</codes>
-            </con:configuration>
-          </con:assertion>
-          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="sonstPlanArt">
-            <con:configuration>
-              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
-declare namespace xplan='http://www.deegree.org/xplanung/1/0';
-
-//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:sonstPlanArt</path>
-              <content>11002</content>
-              <allowWildcards>false</allowWildcards>
-              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
-              <ignoreComments>false</ignoreComments>
-            </con:configuration>
-          </con:assertion>
-          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="sonstPlanArtWert">
-            <con:configuration>
-              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
-declare namespace xplan='http://www.deegree.org/xplanung/1/0';
-
-//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:sonstPlanArtWert</path>
-              <content>${#TestSuite#codelistValue_BP_SonstPlanArt_11002}</content>
-              <allowWildcards>false</allowWildcards>
-              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
-              <ignoreComments>false</ignoreComments>
-            </con:configuration>
-          </con:assertion>
-          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="status">
-            <con:configuration>
-              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
-declare namespace xplan='http://www.deegree.org/xplanung/1/0';
-
-//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:status</path>
-              <content>19999</content>
-              <allowWildcards>false</allowWildcards>
-              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
-              <ignoreComments>false</ignoreComments>
-            </con:configuration>
-          </con:assertion>
-          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="statusWert">
-            <con:configuration>
-              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
-declare namespace xplan='http://www.deegree.org/xplanung/1/0';
-
-//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:statusWert</path>
-              <content>${#TestSuite#codelistValue_BP_Status_19999}</content>
-              <allowWildcards>false</allowWildcards>
-              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
-              <ignoreComments>false</ignoreComments>
-            </con:configuration>
-          </con:assertion>
-          <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
-            <con:domain/>
-            <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
-            <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
-            <con:preemptive>true</con:preemptive>
-            <con:authType>Preemptive</con:authType>
-          </con:credentials>
-          <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
-          <con:jmsPropertyConfig/>
-          <con:parameters>
-            <con:parameter>
-              <con:name>service</con:name>
-              <con:value>WFS</con:value>
-              <con:style>QUERY</con:style>
-              <con:default>WFS</con:default>
-              <con:path xsi:nil="true"/>
-              <con:description xsi:nil="true"/>
-            </con:parameter>
-            <con:parameter>
-              <con:name>request</con:name>
-              <con:value>GetFeature</con:value>
-              <con:style>QUERY</con:style>
-              <con:default>GetCapabilities</con:default>
-              <con:path xsi:nil="true"/>
-              <con:description xsi:nil="true"/>
-            </con:parameter>
-            <con:parameter>
-              <con:name>version</con:name>
-              <con:value>2.0.0</con:value>
-              <con:style>QUERY</con:style>
-            </con:parameter>
-            <con:parameter>
-              <con:name>StoredQuery_ID</con:name>
-              <con:value>urn:ogc:def:query:OGC-WFS::PlanNameAndType</con:value>
-              <con:style>QUERY</con:style>
-            </con:parameter>
-            <con:parameter>
-              <con:name>planName</con:name>
-              <con:value>BP_5.2-externalCodelist_SoapUI-XPlanManagerAPI</con:value>
-              <con:style>QUERY</con:style>
-            </con:parameter>
-            <con:parameter>
-              <con:name>typeNames</con:name>
-              <con:value>xplan:BP_Plan</con:value>
-              <con:style>QUERY</con:style>
-            </con:parameter>
-          </con:parameters>
-        </con:config>
-      </con:testStep>
-      <con:testStep type="restrequest" name="DEL BP 5.2 pI deletePlan" id="056f2a2e-e19f-4f59-910d-8ccb7159da0a">
-        <con:settings/>
-        <con:config service="XPlanManagerAPI" resourcePath="/plan/{planId}" methodName="delete" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:restRequest name="DEL BP 5.2 pI deletePlan" id="d1cd7d2d-f354-4a5a-9fa0-1137ede48dcd" mediaType="application/json" postQueryString="false">
-            <con:settings>
-              <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;entry key="Accept" value="application/json" xmlns="http://eviware.com/soapui/config"/></con:setting>
-            </con:settings>
-            <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
-            <con:request/>
-            <con:originalUri>http://localhost/xplan-manager-api/xmanager/api/v1/plan/</con:originalUri>
-            <con:assertion type="Valid HTTP Status Codes" id="859dc093-1e4d-4794-bcc1-58695077093f" name="Valid HTTP Status Codes">
-              <con:configuration>
-                <codes>200</codes>
-              </con:configuration>
-            </con:assertion>
-            <con:assertion type="JsonPath Existence Match" id="265e523e-b027-4418-ada5-9044a1a6e4b2" name="message">
-              <con:configuration>
-                <path>$..message</path>
-                <content>true</content>
-                <allowWildcards>false</allowWildcards>
-                <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
-                <ignoreComments>false</ignoreComments>
-              </con:configuration>
-            </con:assertion>
-            <con:credentials>
-              <con:username>${#Project#username}</con:username>
-              <con:password>${#Project#password}</con:password>
-              <con:domain xsi:nil="true"/>
-              <con:selectedAuthProfile>No Authorization</con:selectedAuthProfile>
-              <con:preemptive>true</con:preemptive>
-              <con:authType>No Authorization</con:authType>
-            </con:credentials>
-            <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
-            <con:jmsPropertyConfig/>
-            <con:parameters>
-              <entry key="planId" value="${#TestCase#planId}" xmlns="http://eviware.com/soapui/config"/>
-            </con:parameters>
-          </con:restRequest>
-        </con:config>
-      </con:testStep>
-      <con:testStep type="transfer" name="Cleanup" id="b06a5a6a-16eb-4991-978e-161758e5264a">
-        <con:settings/>
-        <con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="false" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false">
-            <con:name>planId</con:name>
-            <con:sourceType>empty</con:sourceType>
-            <con:sourceStep>#TestCase#</con:sourceStep>
-            <con:sourcePath/>
-            <con:targetType>planId</con:targetType>
-            <con:targetStep>#TestCase#</con:targetStep>
-            <con:type>XPATH</con:type>
-            <con:targetTransferType>XPATH</con:targetTransferType>
-            <con:upgraded>true</con:upgraded>
-          </con:transfers>
-        </con:config>
-      </con:testStep>
-      <con:properties>
-        <con:property>
-          <con:name>planId</con:name>
-          <con:value/>
-        </con:property>
-        <con:property>
-          <con:name>empty</con:name>
-          <con:value/>
-        </con:property>
-      </con:properties>
-    </con:testCase>
-    <con:properties>
-      <con:property>
-        <con:name>codelistValue_BP_SonstPlanArt_11002</con:name>
-        <con:value>TeilbebauungsPlan</con:value>
-      </con:property>
-      <con:property>
-        <con:name>codelistValue_BP_Status_19999</con:name>
-        <con:value>19999</con:value>
-      </con:property>
-    </con:properties>
-  </con:testSuite>
   <con:endpointStrategy xsi:type="con:DefaultEndpointStrategy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <con:endpoint mode="COMPLEMENT" username="${#Project#username}" password="${#Project#password}">${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
   </con:endpointStrategy>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
index 48cb4f1bf6..93ef4024eb 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
@@ -34,6 +34,49 @@ baseUrlManagerApi=https://xplanbox.lat-lon.de
 baseUrlMapServer=https://xplanbox.lat-lon.de
 baseUrlMapProxy=https://xplanbox.lat-lon.de</con:description>
   <con:settings/>
+  <con:testSuite id="81cca66f-08ce-48a9-920a-5080ee085031" name="Authorization-Setup">
+    <con:settings/>
+    <con:runType>SEQUENTIAL</con:runType>
+    <con:testCase id="ecd0f527-167f-4a30-93f9-3b9c6624a94a" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Set Credentials" searchProperties="true">
+      <con:settings/>
+      <con:testStep type="groovy" name="Groovy Script" id="3662172f-fb92-4f65-b722-11ff47a5b169">
+        <con:settings/>
+        <con:config>
+          <script>// Get the project from the testRunner
+def project = testRunner.testCase.testSuite.project
+
+// Get the values of the custom properties "username" and "password" (credentials)
+def username = project.getPropertyValue("username")
+def password = project.getPropertyValue("password")
+
+// Check if "username" and "password" are not empty
+if (username &amp;&amp; password) {
+    // If they are not empty, assign the values to the other custom properties (credentials)
+    		//XPlanServices
+    project.setPropertyValue("usernameServices", username)
+    project.setPropertyValue("passwordServices", password)
+    		//InspirePLU
+    project.setPropertyValue("usernameInspirePlu", username)
+    project.setPropertyValue("passwordInspirePlu", password)
+    		//XPlanManagerAPI
+    project.setPropertyValue("usernameManagerApi", username)
+    project.setPropertyValue("passwordManagerApi", password)
+    		// MapServer
+    project.setPropertyValue("usernameMapServer", username)
+    project.setPropertyValue("passwordMapServer", password)
+    		// MapProxy
+    project.setPropertyValue("usernameMapProxy", username)
+    project.setPropertyValue("passwordMapProxy", password)
+} else {
+    // Log a message if either "username" or "password" is empty
+    log.info "No value set for Username and/or Password. Therefore they are not set for the other custom properties (credentials)."
+}</script>
+        </con:config>
+      </con:testStep>
+      <con:properties/>
+    </con:testCase>
+    <con:properties/>
+  </con:testSuite>
   <con:testSuite id="ef6a4631-78a1-4c83-b55b-a5a410e4ae47" name="xplan-wms">
     <con:settings/>
     <con:runType>SEQUENTIAL</con:runType>
@@ -97,8 +140,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -130,6 +173,7 @@ exists(/wms:WMS_Capabilities)</path>
         <con:config method="GET" xsi:type="con:HttpRequest" id="c94db636-c152-447a-94e1-768498fbcd21" name="GetMap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlServices}/xplan-wms/services/wms</con:endpoint>
           <con:request/>
@@ -146,8 +190,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -304,8 +348,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -353,8 +397,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -512,8 +556,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -561,8 +605,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -686,8 +730,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -735,8 +779,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -860,8 +904,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -909,8 +953,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1034,8 +1078,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1083,8 +1127,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1208,8 +1252,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1257,8 +1301,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1382,8 +1426,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1431,8 +1475,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1556,8 +1600,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1605,8 +1649,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1730,8 +1774,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1779,8 +1823,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1904,8 +1948,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -1953,8 +1997,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2078,8 +2122,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2127,8 +2171,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2252,8 +2296,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2301,8 +2345,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2427,8 +2471,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2476,8 +2520,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2581,6 +2625,7 @@ exists(/wms:WMS_Capabilities)</path>
         <con:config method="GET" xsi:type="con:HttpRequest" id="1aa96199-3dfe-48cb-a784-acc137e9febc" name="GetCapabilities" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:encoding xsi:nil="true"/>
           <con:endpoint>${#Project#baseUrlServices}/xplan-wms/services/fpwmsarchive</con:endpoint>
@@ -2602,8 +2647,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2651,8 +2696,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2777,8 +2822,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2826,8 +2871,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -2952,8 +2997,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3001,8 +3046,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3127,8 +3172,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3176,8 +3221,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3290,8 +3335,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -3350,8 +3395,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3501,8 +3546,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3541,8 +3586,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3606,8 +3651,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -3682,8 +3727,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3735,8 +3780,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3777,8 +3822,8 @@ exists(/wms:WMS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3813,8 +3858,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -3880,8 +3925,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -3952,8 +3997,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -4062,8 +4107,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -4112,8 +4157,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -4145,8 +4190,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -4194,8 +4239,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -4248,8 +4293,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -4348,6 +4393,7 @@ exists(ogc:ServiceExceptionReport)</path>
         <con:config method="GET" xsi:type="con:HttpRequest" id="c94db636-c152-447a-94e1-768498fbcd21" name="GetFeatureInfo-html BP_BaugebietsTeilFlaeche" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlServices}/xplan-wms/services/wms</con:endpoint>
           <con:request/>
@@ -4380,8 +4426,8 @@ exists(ogc:ServiceExceptionReport)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -4526,8 +4572,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -4632,6 +4678,7 @@ if (documentUrl != null){
         <con:config method="GET" xsi:type="con:HttpRequest" id="c94db636-c152-447a-94e1-768498fbcd21" name="GetFeatureInfo-xml BP_BaugebietsTeilFlaeche" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlServices}/xplan-wms/services/wms</con:endpoint>
           <con:request/>
@@ -4721,8 +4768,8 @@ if (documentUrl != null){
             <con:configuration/>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -4983,8 +5030,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5098,8 +5145,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5123,8 +5170,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5148,8 +5195,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5261,8 +5308,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5293,8 +5340,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5325,8 +5372,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5357,8 +5404,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5389,8 +5436,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5414,8 +5461,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5446,8 +5493,8 @@ if (documentUrl != null){
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5530,8 +5577,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5620,8 +5667,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5710,8 +5757,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5756,8 +5803,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -5909,8 +5956,8 @@ count(//wfs:ListStoredQueriesResponse/wfs:StoredQuery/wfs:Title[text()='planName
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -5947,6 +5994,7 @@ count(//wfs:ListStoredQueriesResponse/wfs:StoredQuery/wfs:Title[text()='planName
         <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanSynWFS DescribeStoredQueries" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlServices}/xplansyn-wfs/services/xplansynwfs</con:endpoint>
           <con:request/>
@@ -6011,8 +6059,8 @@ exists(//wfs:DescribeStoredQueriesResponse)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6070,8 +6118,8 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6152,8 +6200,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6285,8 +6333,8 @@ count(//wfs:member)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6426,8 +6474,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6536,8 +6584,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6598,8 +6646,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -6648,8 +6696,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -6681,8 +6729,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -6730,8 +6778,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -6784,8 +6832,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -6833,8 +6881,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -6883,8 +6931,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -6923,6 +6971,7 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
         <con:config method="POST" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="Import BP_5.1_Textsortierung_4.zip" mediaType="application/octet-stream" postQueryString="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1/plan</con:endpoint>
           <con:request/>
@@ -6932,8 +6981,8 @@ exists(//wfs:member/xplan:BP_Bereich)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -7188,8 +7237,8 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -7354,8 +7403,8 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -7423,8 +7472,8 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -7540,8 +7589,8 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -7652,8 +7701,8 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -7777,8 +7826,8 @@ Zum Schutz des Grundwassers darf bei der Gründung des Bauvorhabens eine Untersc
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -7950,8 +7999,8 @@ Die zum Erhalt festgesetzten Bestandsbäume und alle Bäume im näheren Umfeld d
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8141,8 +8190,8 @@ Alle nicht in der vorstehenden Aufstellung enthaltenen Sortimente sind "nicht ze
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8317,8 +8366,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8374,8 +8423,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8399,8 +8448,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8415,6 +8464,7 @@ dienen.]</content>
         <con:config method="DELETE" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="Delete BP_5.1_Textsortierung_1.zip" mediaType="application/octet-stream" postQueryString="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1/plan/${#TestCase#planIdTextsortierung_1}</con:endpoint>
           <con:request/>
@@ -8424,8 +8474,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8449,8 +8499,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8474,8 +8524,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8499,8 +8549,8 @@ dienen.]</content>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8669,8 +8719,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8726,8 +8776,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8783,8 +8833,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8840,8 +8890,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8897,8 +8947,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -8954,8 +9004,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9035,8 +9085,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9116,8 +9166,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9173,8 +9223,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9230,8 +9280,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9287,8 +9337,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9344,8 +9394,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9401,8 +9451,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9458,8 +9508,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9539,8 +9589,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9620,8 +9670,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9677,8 +9727,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9734,8 +9784,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9791,8 +9841,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9848,8 +9898,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9905,8 +9955,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -9962,8 +10012,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10043,8 +10093,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10124,8 +10174,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10170,8 +10220,8 @@ declare namespace ows='http://www.opengis.net/ows/1.1';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -10257,8 +10307,8 @@ count(//wfs:ListStoredQueriesResponse/wfs:StoredQuery/wfs:ReturnFeatureType[text
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10348,8 +10398,8 @@ exists(//wfs:DescribeStoredQueriesResponse)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10406,8 +10456,8 @@ count(//wfs:member)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10492,8 +10542,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10570,8 +10620,8 @@ count(//wfs:member)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10656,8 +10706,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10723,8 +10773,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10773,8 +10823,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -10860,8 +10910,8 @@ count(//wfs:ListStoredQueriesResponse/wfs:StoredQuery/wfs:ReturnFeatureType[text
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -10951,8 +11001,8 @@ exists(//wfs:DescribeStoredQueriesResponse)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11009,8 +11059,8 @@ count(//wfs:member)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11095,8 +11145,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11162,8 +11212,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11212,8 +11262,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -11245,8 +11295,8 @@ declare namespace gml='http://www.opengis.net/gml/3.2';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -11422,8 +11472,8 @@ declare namespace xplan='http://www.xplanung.de/xplangml/6/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11564,8 +11614,8 @@ declare namespace xplan='http://www.xplanung.de/xplangml/6/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11621,8 +11671,8 @@ declare namespace xplan='http://www.xplanung.de/xplangml/6/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11690,8 +11740,8 @@ declare namespace xplan='http://www.xplanung.de/xplangml/6/0';
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:preemptive>true</con:preemptive>
@@ -11751,8 +11801,8 @@ exists(//xplan:position/gml:CompositeCurve[count(gml:curveMember)=20])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11808,8 +11858,8 @@ exists(//xplan:position/gml:CompositeCurve[count(gml:curveMember)=20])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11882,8 +11932,8 @@ exists(/wms:WMS_Capabilities)</path>
             <con:configuration/>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameInspirePlu}</con:username>
+            <con:password>${#Project#passwordInspirePlu}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -11939,8 +11989,8 @@ exists(/wfs:WFS_Capabilities)</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameInspirePlu}</con:username>
+            <con:password>${#Project#passwordInspirePlu}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12166,8 +12216,8 @@ exists(//wms:Layer[wms:Name='so_rasterarchive'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapServer}</con:username>
+            <con:password>${#Project#passwordMapServer}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12219,8 +12269,8 @@ exists(//wms:Layer[wms:Name='so_rasterarchive'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapServer}</con:username>
+            <con:password>${#Project#passwordMapServer}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12329,6 +12379,7 @@ exists(//wms:Layer[wms:Name='so_rasterarchive'])</path>
         <con:config method="GET" xsi:type="con:HttpRequest" id="583d2488-b5af-4e99-bd6c-0780c2db7a8c" name="GetCapabilities" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <con:settings>
             <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
           </con:settings>
           <con:endpoint>${#Project#baseUrlMapProxy}/wms</con:endpoint>
           <con:request/>
@@ -12459,8 +12510,8 @@ exists(//wms:Layer[wms:Name='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12512,8 +12563,8 @@ exists(//wms:Layer[wms:Name='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12629,8 +12680,8 @@ exists(//wms:Layer[wms:Name='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12879,8 +12930,8 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -12932,8 +12983,8 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -13045,8 +13096,8 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -13158,8 +13209,8 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -13190,8 +13241,8 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
             </con:configuration>
           </con:assertion>
           <con:credentials>
-            <con:username>${#Project#username}</con:username>
-            <con:password>${#Project#password}</con:password>
+            <con:username>${#Project#usernameMapProxy}</con:username>
+            <con:password>${#Project#passwordMapProxy}</con:password>
             <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
             <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
             <con:authType>Global HTTP Settings</con:authType>
@@ -13205,6 +13256,253 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
     </con:testCase>
     <con:properties/>
   </con:testSuite>
+  <con:testSuite id="86464263-f8ad-4795-9ea4-93a2ca647986" name="Codelists TestSuite">
+    <con:settings/>
+    <con:runType>SEQUENTIAL</con:runType>
+    <con:testCase id="d2203872-eea8-4f26-ba3f-a3b9620e17f1" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="externalCodelists" searchProperties="true">
+      <con:settings/>
+      <con:testStep type="httprequest" name="POST BP 5.2 XX importPlan" id="602c62dc-1de7-4c6d-8c17-05213b111b86">
+        <con:settings/>
+        <con:config method="POST" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="POST BP 5.2 XX importPlan" mediaType="application/octet-stream" postQueryString="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <con:settings>
+            <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+          </con:settings>
+          <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1/plan</con:endpoint>
+          <con:request/>
+          <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes">
+            <con:configuration>
+              <codes>201</codes>
+            </con:configuration>
+          </con:assertion>
+          <con:credentials>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
+            <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+            <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+            <con:preemptive>true</con:preemptive>
+            <con:authType>Preemptive</con:authType>
+          </con:credentials>
+          <con:attachment>
+            <con:name>BP_5.2_externalCodelist.zip</con:name>
+            <con:contentType>application/octet-stream</con:contentType>
+            <con:contentId>BP_5.2_externalCodelist.zip</con:contentId>
+            <con:part xsi:nil="true"/>
+            <con:url>${projectDir}/xplan-webservices/plans/BP_5.2_externalCodelist.zip</con:url>
+            <con:id>f4992d26-e700-4ffd-87cc-39551e589e8c</con:id>
+          </con:attachment>
+          <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+          <con:jmsPropertyConfig/>
+          <con:parameters>
+            <con:parameter>
+              <con:name>skipSemantisch</con:name>
+              <con:value>true</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+            <con:parameter>
+              <con:name>skipFlaechenschluss</con:name>
+              <con:value>true</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+            <con:parameter>
+              <con:name>skipGeltungsbereich</con:name>
+              <con:value>true</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+          </con:parameters>
+        </con:config>
+      </con:testStep>
+      <con:testStep type="transfer" name="Property Transfer" id="0c9e3808-2d26-4914-b92e-2796aa5cc4a6">
+        <con:settings/>
+        <con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false">
+            <con:name>planId</con:name>
+            <con:sourceType>Response</con:sourceType>
+            <con:sourceStep>POST BP 5.2 XX importPlan</con:sourceStep>
+            <con:sourcePath>$.id</con:sourcePath>
+            <con:targetType>planId</con:targetType>
+            <con:targetStep>#TestCase#</con:targetStep>
+            <con:type>JSONPATH</con:type>
+            <con:targetTransferType>JSONPATH</con:targetTransferType>
+            <con:upgraded>true</con:upgraded>
+          </con:transfers>
+        </con:config>
+      </con:testStep>
+      <con:testStep type="httprequest" name="GetFeatureByPlanNameAndType" id="7fc01698-4e95-412e-9491-3c766d27d245">
+        <con:settings/>
+        <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="GetFeatureByPlanNameAndType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <con:settings>
+            <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+            <con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting>
+          </con:settings>
+          <con:endpoint>${#Project#baseUrlServices}/xplansyn-wfs/services/xplansynwfs</con:endpoint>
+          <con:request/>
+          <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes">
+            <con:configuration>
+              <codes>200</codes>
+            </con:configuration>
+          </con:assertion>
+          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="sonstPlanArt">
+            <con:configuration>
+              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
+declare namespace xplan='http://www.deegree.org/xplanung/1/0';
+
+//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:sonstPlanArt</path>
+              <content>11002</content>
+              <allowWildcards>false</allowWildcards>
+              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+              <ignoreComments>false</ignoreComments>
+            </con:configuration>
+          </con:assertion>
+          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="sonstPlanArtWert">
+            <con:configuration>
+              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
+declare namespace xplan='http://www.deegree.org/xplanung/1/0';
+
+//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:sonstPlanArtWert</path>
+              <content>${#TestSuite#codelistValue_BP_SonstPlanArt_11002}</content>
+              <allowWildcards>false</allowWildcards>
+              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+              <ignoreComments>false</ignoreComments>
+            </con:configuration>
+          </con:assertion>
+          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="status">
+            <con:configuration>
+              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
+declare namespace xplan='http://www.deegree.org/xplanung/1/0';
+
+//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:status</path>
+              <content>19999</content>
+              <allowWildcards>false</allowWildcards>
+              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+              <ignoreComments>false</ignoreComments>
+            </con:configuration>
+          </con:assertion>
+          <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="statusWert">
+            <con:configuration>
+              <path>declare namespace wfs='http://www.opengis.net/wfs/2.0';
+declare namespace xplan='http://www.deegree.org/xplanung/1/0';
+
+//wfs:member/xplan:BP_Plan[xplan:xplanMgrPlanId = ${#TestCase#planId}]/xplan:statusWert</path>
+              <content>${#TestSuite#codelistValue_BP_Status_19999}</content>
+              <allowWildcards>false</allowWildcards>
+              <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+              <ignoreComments>false</ignoreComments>
+            </con:configuration>
+          </con:assertion>
+          <con:credentials>
+            <con:username>${#Project#usernameServices}</con:username>
+            <con:password>${#Project#passwordServices}</con:password>
+            <con:domain/>
+            <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+            <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+            <con:preemptive>true</con:preemptive>
+            <con:authType>Preemptive</con:authType>
+          </con:credentials>
+          <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+          <con:jmsPropertyConfig/>
+          <con:parameters>
+            <con:parameter>
+              <con:name>service</con:name>
+              <con:value>WFS</con:value>
+              <con:style>QUERY</con:style>
+              <con:default>WFS</con:default>
+              <con:path xsi:nil="true"/>
+              <con:description xsi:nil="true"/>
+            </con:parameter>
+            <con:parameter>
+              <con:name>request</con:name>
+              <con:value>GetFeature</con:value>
+              <con:style>QUERY</con:style>
+              <con:default>GetCapabilities</con:default>
+              <con:path xsi:nil="true"/>
+              <con:description xsi:nil="true"/>
+            </con:parameter>
+            <con:parameter>
+              <con:name>version</con:name>
+              <con:value>2.0.0</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+            <con:parameter>
+              <con:name>StoredQuery_ID</con:name>
+              <con:value>urn:ogc:def:query:OGC-WFS::PlanNameAndType</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+            <con:parameter>
+              <con:name>planName</con:name>
+              <con:value>BP_5.2-externalCodelist_SoapUI-XPlanManagerAPI</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+            <con:parameter>
+              <con:name>typeNames</con:name>
+              <con:value>xplan:BP_Plan</con:value>
+              <con:style>QUERY</con:style>
+            </con:parameter>
+          </con:parameters>
+        </con:config>
+      </con:testStep>
+      <con:testStep type="httprequest" name="DEL BP 5.2 pl deletePlan" id="70ee68d6-9c4e-4e86-8abd-71c678cf7298">
+        <con:settings/>
+        <con:config method="DELETE" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="DEL BP 5.2 pl deletePlan" mediaType="application/octet-stream" postQueryString="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <con:settings>
+            <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting>
+          </con:settings>
+          <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1/plan/${#TestCase#planId}</con:endpoint>
+          <con:request/>
+          <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes">
+            <con:configuration>
+              <codes>200</codes>
+            </con:configuration>
+          </con:assertion>
+          <con:credentials>
+            <con:username>${#Project#usernameManagerApi}</con:username>
+            <con:password>${#Project#passwordManagerApi}</con:password>
+            <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+            <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+            <con:authType>Global HTTP Settings</con:authType>
+          </con:credentials>
+          <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+          <con:jmsPropertyConfig/>
+          <con:parameters/>
+        </con:config>
+      </con:testStep>
+      <con:testStep type="transfer" name="Cleanup" id="1e29f421-3bd7-4953-8c9f-0c172b7e665a">
+        <con:settings/>
+        <con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <con:transfers setNullOnMissingSource="true" transferTextContent="true" failOnError="false" ignoreEmpty="false" transferToAll="false" entitize="false" transferChildNodes="false">
+            <con:name>planId</con:name>
+            <con:sourceType>empty</con:sourceType>
+            <con:sourceStep>#TestCase#</con:sourceStep>
+            <con:sourcePath/>
+            <con:targetType>planId</con:targetType>
+            <con:targetStep>#TestCase#</con:targetStep>
+            <con:type>XPATH</con:type>
+            <con:targetTransferType>XPATH</con:targetTransferType>
+            <con:upgraded>true</con:upgraded>
+          </con:transfers>
+        </con:config>
+      </con:testStep>
+      <con:properties>
+        <con:property>
+          <con:name>planId</con:name>
+          <con:value/>
+        </con:property>
+        <con:property>
+          <con:name>empty</con:name>
+          <con:value/>
+        </con:property>
+      </con:properties>
+    </con:testCase>
+    <con:properties>
+      <con:property>
+        <con:name>codelistValue_BP_SonstPlanArt_11002</con:name>
+        <con:value>TeilbebauungsPlan</con:value>
+      </con:property>
+      <con:property>
+        <con:name>codelistValue_BP_Status_19999</con:name>
+        <con:value>19999</con:value>
+      </con:property>
+    </con:properties>
+  </con:testSuite>
   <con:properties>
     <con:property>
       <con:name>baseUrlServices</con:name>
@@ -13234,6 +13532,46 @@ exists(//wmts:Layer[ows:Identifier='so_objekte'])</path>
       <con:name>password</con:name>
       <con:value/>
     </con:property>
+    <con:property>
+      <con:name>usernameServices</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordServices</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>usernameInspirePlu</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordInspirePlu</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>usernameManagerApi</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordManagerApi</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>usernameMapServer</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordMapServer</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>usernameMapProxy</con:name>
+      <con:value/>
+    </con:property>
+    <con:property>
+      <con:name>passwordMapProxy</con:name>
+      <con:value/>
+    </con:property>
     <con:property>
       <con:name>apiKey</con:name>
       <con:value>xplanbox</con:value>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BP_5.2_externalCodelist.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices/plans/BP_5.2_externalCodelist.zip
similarity index 100%
rename from xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BP_5.2_externalCodelist.zip
rename to xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices/plans/BP_5.2_externalCodelist.zip
-- 
GitLab