From 3afa3cd828a3f92e8df78781eb26c384b6d6c7ad Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 18 Sep 2023 13:42:11 +0200
Subject: [PATCH] [Project] Remove default privilegeConflictResolution value

---
 .../archetype-resources/runtime/config/PrivilegeConfig.xml       | 1 -
 .../test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml | 1 -
 .../runtime/config/PrivilegeConfig.xml                           | 1 -
 .../__rootArtifactId__-web/runtime/config/PrivilegeConfig.xml    | 1 -
 .../archetype-resources/runtime/config/PrivilegeConfig.xml       | 1 -
 .../test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml | 1 -
 6 files changed, 6 deletions(-)

diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
index c0e3aba..7086879 100644
--- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
+++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME-2"/>
             <Parameter name="persistSessions" value="true"/>
             <Parameter name="autoPersistOnUserChangesData" value="true"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
             <Parameter name="allowSessionRefresh" value="true"/>
         </Parameters>
 
diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
index be4bbfc..4cb9eaf 100644
--- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
+++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME-2"/>
             <Parameter name="persistSessions" value="true"/>
             <Parameter name="autoPersistOnUserChangesData" value="true"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
         </Parameters>
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/config/PrivilegeConfig.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/config/PrivilegeConfig.xml
index 7071ddd..4e86470 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/config/PrivilegeConfig.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/runtime/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME-2"/>
             <Parameter name="persistSessions" value="true"/>
 			<Parameter name="autoPersistOnUserChangesData" value="false"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
             <Parameter name="allowSessionRefresh" value="true"/>
         </Parameters>
 
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/config/PrivilegeConfig.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/config/PrivilegeConfig.xml
index 7071ddd..4e86470 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/config/PrivilegeConfig.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/runtime/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME-2"/>
             <Parameter name="persistSessions" value="true"/>
 			<Parameter name="autoPersistOnUserChangesData" value="false"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
             <Parameter name="allowSessionRefresh" value="true"/>
         </Parameters>
 
diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
index 7071ddd..4e86470 100644
--- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
+++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME-2"/>
             <Parameter name="persistSessions" value="true"/>
 			<Parameter name="autoPersistOnUserChangesData" value="false"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
             <Parameter name="allowSessionRefresh" value="true"/>
         </Parameters>
 
diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
index c0e3aba..7086879 100644
--- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
+++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME-2"/>
             <Parameter name="persistSessions" value="true"/>
             <Parameter name="autoPersistOnUserChangesData" value="true"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
             <Parameter name="allowSessionRefresh" value="true"/>
         </Parameters>