Merge branch 'master' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.backend
diff --git a/oKBereitschaftsplanungBackend/src/main/resources/application.properties b/oKBereitschaftsplanungBackend/src/main/resources/application.properties
index cef8ba8..ad3c753 100644
--- a/oKBereitschaftsplanungBackend/src/main/resources/application.properties
+++ b/oKBereitschaftsplanungBackend/src/main/resources/application.properties
@@ -1,67 +1,67 @@
-#Database Configuration
-# -----------------------------------
-# postgres
-#------------------------------------
-db.driver=org.postgresql.Driver
-db.url=jdbc:postgresql://${dbHost}:5432/${dbName}
-db.username=bp
-db.password=bp
-db.plattform=org.eclipse.persistence.platform.database.PostgreSQLPlatform
-db.schema=public
-# -----------------------------------
-# oracle
-#------------------------------------
-#db.driver=oracle.jdbc.OracleDriver
-#db.url=jdbc:oracle:thin:openk/openk@//serverName.de:port/seviceName
-#jdbc:jdbc:oracle://serverName.de:port/serviceName
-#db.username=OPENK
-#db.password=openk
-#db.plattform=org.eclipse.persistence.platform.database.OraclePlatform
-#db.schema=OPENK
-
-#defines if an re-deploy and re-initialization is needed. (true/false)
-db.redeploy=false
-
-
-#Keycloak Portal
-portal.url=http://${kcHost}:${kcPort}/portal/rest/beservice
-portal.useHttps=true
-
-#Application
-backend.version=DEVELOP 0.9.0
-backend.timezone=${timezone}
-frontend.dashboard.url=https://${tomcatHost}/spfe/dashboard
-
-#Reports
-reports.path=reports
-reports.workdirectory=${reportsWrk}
-
-#Distance Service
-distance.url=http://${distanceHost}:${distancePort}/distance/webapi/calcList
-distance.useHttps=true
-distance.skip=false
-
-#SQL-init-scripts
-sql.scripts.delete=delete/BER_delete_from
-sql.scripts.init=init/BER_insert_standby_status,init/BER_insert_postcode,init/BER_insert_branch,init/BER_insert_user_function,init/BER_insert_location,init/BER_insert_int_location_has_postcode,init/BER_insert_region,init/BER_insert_int_regions_in_location,init/BER_insert_address,init/BER_insert_organisation,init/BER_insert_contact_data,init/BER_insert_standby_user,init/BER_insert_standby_group,init/BER_insert_user_in_region,init/BER_insert_int_standbygroup_has_function,init/BER_insert_standby_list,init/BER_insert_standby_list_has_standby_group,init/BER_insert_standby_schedule_body,init/BER_insert_standby_duration,init/BER_insert_int_branches_for_group,init/BER_insert_int_regions_for_standby_group,init/BER_insert_location_for_branch,init/BER_insert_user_in_standby_group
-sql.scripts.hist=hist/BER_hist_address,hist/BER_hist_branch,hist/BER_hist_calendar,hist/BER_hist_contact_data,hist/BER_hist_int_branches_for_groups,hist/BER_hist_int_groups_in_list,hist/BER_hist_int_location_has_postcode,hist/BER_hist_int_regions_in_location,hist/BER_hist_location,hist/BER_hist_location_for_branch,hist/BER_hist_organisation,hist/BER_hist_postcode,hist/BER_hist_region,hist/BER_hist_standby_duration,hist/BER_hist_standby_group,hist/BER_hist_standby_list,hist/BER_hist_standby_planning_status,hist/BER_hist_standby_schedule_body,hist/BER_hist_standby_schedule_header,hist/BER_hist_standby_schedule_history,hist/BER_hist_standby_status,hist/BER_hist_standby_user,hist/BER_hist_user_function,hist/BER_hist_user_has_user_function,hist/BER_hist_user_in_region,hist/BER_hist_user_in_standby_group,hist/BER_hist_int_standbygroup_has_function
-
-#Mail
-mail.template.path=mail
-smtp.active=true
-smtp.host=${mailHost}
-smtp.port=${mailPort}
-smtp.use.ssl=false
-smtp.auth.user=
-smtp.auth.pw=
-smtp.app.sender.name=Bereitschaftsplanung
-smtp.app.sender.email=noReplay@Bereitschaftsplanung.ok.de
-smtp.backup.mail.recipient=wfp.support@mettenmeier.de
-
-#placeholder user ids
-placeholder.standby.user.ids=3,4,5,6,7,8,9,10,11
-
-#validation options
-validate.transfer=false
-validate.delete=false
-
+#Database Configuration

+# -----------------------------------

+# postgres

+#------------------------------------

+db.driver=org.postgresql.Driver

+db.url=jdbc:postgresql://${dbHost}:5432/${dbName}

+db.username=bp

+db.password=bp

+db.plattform=org.eclipse.persistence.platform.database.PostgreSQLPlatform

+db.schema=public

+# -----------------------------------

+# oracle

+#------------------------------------

+#db.driver=oracle.jdbc.OracleDriver

+#db.url=jdbc:oracle:thin:openk/openk@//serverName.de:port/seviceName

+#jdbc:jdbc:oracle://serverName.de:port/serviceName

+#db.username=OPENK

+#db.password=openk

+#db.plattform=org.eclipse.persistence.platform.database.OraclePlatform

+#db.schema=OPENK

+

+#defines if an re-deploy and re-initialization is needed. (true/false)

+db.redeploy=false

+

+

+#Keycloak Portal

+portal.url=http://${kcHost}:${kcPort}/portal/rest/beservice

+portal.useHttps=true

+

+#Application

+backend.version=DEVELOP 0.9.0

+backend.timezone=${timezone}

+frontend.dashboard.url=https://${tomcatHost}/spfe/dashboard

+

+#Reports

+reports.path=reports

+reports.workdirectory=${reportsWrk}

+

+#Distance Service

+distance.url=http://${distanceHost}:${distancePort}/distance/webapi/calcList

+distance.useHttps=true

+distance.skip=false

+

+#SQL-init-scripts

+sql.scripts.delete=delete/BER_delete_from

+sql.scripts.init=init/BER_insert_standby_status,init/BER_insert_postcode,init/BER_insert_branch,init/BER_insert_user_function,init/BER_insert_location,init/BER_insert_int_location_has_postcode,init/BER_insert_region,init/BER_insert_int_regions_in_location,init/BER_insert_address,init/BER_insert_organisation,init/BER_insert_contact_data,init/BER_insert_standby_user,init/BER_insert_standby_group,init/BER_insert_user_in_region,init/BER_insert_int_standbygroup_has_function,init/BER_insert_standby_list,init/BER_insert_standby_list_has_standby_group,init/BER_insert_standby_schedule_body,init/BER_insert_standby_duration,init/BER_insert_int_branches_for_group,init/BER_insert_int_regions_for_standby_group,init/BER_insert_location_for_branch,init/BER_insert_user_in_standby_group

+sql.scripts.hist=hist/BER_hist_address,hist/BER_hist_branch,hist/BER_hist_calendar,hist/BER_hist_contact_data,hist/BER_hist_int_branches_for_groups,hist/BER_hist_int_groups_in_list,hist/BER_hist_int_location_has_postcode,hist/BER_hist_int_regions_in_location,hist/BER_hist_location,hist/BER_hist_location_for_branch,hist/BER_hist_organisation,hist/BER_hist_postcode,hist/BER_hist_region,hist/BER_hist_standby_duration,hist/BER_hist_standby_group,hist/BER_hist_standby_list,hist/BER_hist_standby_planning_status,hist/BER_hist_standby_schedule_body,hist/BER_hist_standby_schedule_header,hist/BER_hist_standby_schedule_history,hist/BER_hist_standby_status,hist/BER_hist_standby_user,hist/BER_hist_user_function,hist/BER_hist_user_has_user_function,hist/BER_hist_user_in_region,hist/BER_hist_user_in_standby_group,hist/BER_hist_int_standbygroup_has_function

+

+#Mail

+mail.template.path=mail

+smtp.active=true

+smtp.host=${mailHost}

+smtp.port=${mailPort}

+smtp.use.ssl=false

+smtp.auth.user=

+smtp.auth.pw=

+smtp.app.sender.name=Bereitschaftsplanung

+smtp.app.sender.email=noReply@Bereitschaftsplanung.ok.de

+smtp.backup.mail.recipient=wfp.support@mettenmeier.de

+

+#placeholder user ids

+placeholder.standby.user.ids=3,4,5,6,7,8,9,10,11

+

+#validation options

+validate.transfer=false

+validate.delete=false

+