Merge branch 'SI-306-NEW' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP
diff --git a/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.bat b/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.bat
index a5fa623..ccc2d90 100644
--- a/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.bat
+++ b/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.bat
@@ -9,12 +9,12 @@
call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-creator -r Elogbook
echo roles set
REM ***************** CREATING NEW USER *****************
-SET usernameVar=marie_b
+SET usernameVar=marie_q
echo ------- Creating User: %usernameVar% -------
-call kcadm create users -s username=%usernameVar% -s firstName=Marie -s lastName=Bearbeiter -s enabled=true -r Elogbook
+call kcadm create users -s username=%usernameVar% -s firstName=Marie -s lastName=Qualifizierer -s enabled=true -r Elogbook
call kcadm set-password -r Elogbook --username %usernameVar% --new-password %usernameVar%
echo pwd set
-call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-processor -r Elogbook
+call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-qualifier -r Elogbook
echo roles set
REM ***************** CREATING NEW USER *****************
SET usernameVar=laura_p
@@ -22,7 +22,7 @@
call kcadm create users -s username=%usernameVar% -s firstName=Laura -s lastName=Öffentlichkeitsarbeit -s enabled=true -r Elogbook
call kcadm set-password -r Elogbook --username %usernameVar% --new-password %usernameVar%
echo pwd set
-call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-public-relations -r Elogbook
+call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-publisher -r Elogbook
echo roles set
REM ***************** CREATING NEW USER *****************
SET usernameVar=liam_e
@@ -33,12 +33,12 @@
call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-creator -r Elogbook
echo roles set
REM ***************** CREATING NEW USER *****************
-SET usernameVar=theo_b
+SET usernameVar=theo_q
echo ------- Creating User: %usernameVar% -------
-call kcadm create users -s username=%usernameVar% -s firstName=Theo -s lastName=Bearbeiter -s enabled=true -r Elogbook
+call kcadm create users -s username=%usernameVar% -s firstName=Theo -s lastName=Qualifizierer -s enabled=true -r Elogbook
call kcadm set-password -r Elogbook --username %usernameVar% --new-password %usernameVar%
echo pwd set
-call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-processor -r Elogbook
+call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-qualifier -r Elogbook
echo roles set
REM ***************** CREATING NEW USER *****************
SET usernameVar=tom_p
@@ -46,7 +46,7 @@
call kcadm create users -s username=%usernameVar% -s firstName=Tom -s lastName=Öffentlichkeitsarbeit -s enabled=true -r Elogbook
call kcadm set-password -r Elogbook --username %usernameVar% --new-password %usernameVar%
echo pwd set
-call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-public-relations -r Elogbook
+call kcadm add-roles --uusername %usernameVar% --rolename grid-failure-access --rolename grid-failure-publisher -r Elogbook
echo roles set
echo ------- Finished -------
diff --git a/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.sh b/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.sh
index 8109c4e..f74a075 100644
--- a/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.sh
+++ b/gfsBackendService/deploy/keycloak/addKeycloakUsersGFI.sh
@@ -11,12 +11,12 @@
sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-creator -r $realmVar
echo roles set
# ***************** CREATING NEW USER *****************
-usernameVar="marie_b"
+usernameVar="marie_q"
echo ------- Creating User: $usernameVar -------
-sh kcadm.sh create users -s username=$usernameVar -s firstName=Marie -s lastName=Bearbeiter -s enabled=true -r $realmVar
+sh kcadm.sh create users -s username=$usernameVar -s firstName=Marie -s lastName=Qualifizierer -s enabled=true -r $realmVar
sh kcadm.sh set-password -r $realmVar --username $usernameVar --new-password $usernameVar
echo pwd set
-sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-processor -r $realmVar
+sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-qualifier -r $realmVar
echo roles set
# ***************** CREATING NEW USER *****************
usernameVar="laura_p"
@@ -24,7 +24,7 @@
sh kcadm.sh create users -s username=$usernameVar -s firstName=Laura -s lastName=Öffentlichkeitsarbeit -s enabled=true -r $realmVar
sh kcadm.sh set-password -r $realmVar --username $usernameVar --new-password $usernameVar
echo pwd set
-sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-public-relations -r $realmVar
+sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-publisher -r $realmVar
echo roles set
# ***************** CREATING NEW USER *****************
usernameVar="liam_e"
@@ -35,12 +35,12 @@
sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-creator -r $realmVar
echo roles set
# ***************** CREATING NEW USER *****************
-usernameVar="theo_b"
+usernameVar="theo_q"
echo ------- Creating User: $usernameVar -------
-sh kcadm.sh create users -s username=$usernameVar -s firstName=Theo -s lastName=Bearbeiter -s enabled=true -r $realmVar
+sh kcadm.sh create users -s username=$usernameVar -s firstName=Theo -s lastName=Qualifizierer -s enabled=true -r $realmVar
sh kcadm.sh set-password -r $realmVar --username $usernameVar --new-password $usernameVar
echo pwd set
-sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-processor -r $realmVar
+sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-qualifier -r $realmVar
echo roles set
# ***************** CREATING NEW USER *****************
usernameVar="tom_p"
@@ -48,7 +48,7 @@
sh kcadm.sh create users -s username=$usernameVar -s firstName=Tom -s lastName=Öffentlichkeitsarbeit -s enabled=true -r $realmVar
sh kcadm.sh set-password -r $realmVar --username $usernameVar --new-password $usernameVar
echo pwd set
-sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-public-relations -r $realmVar
+sh kcadm.sh add-roles --uusername $usernameVar --rolename grid-failure-access --rolename grid-failure-publisher -r $realmVar
echo roles set
echo ------- Finished -------
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 2f138e1..3b77950 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -161,4 +161,9 @@
listOfServers: http://localhost:8080
cors:
- corsEnabled: true
\ No newline at end of file
+ corsEnabled: true
+
+email:
+ sender: sender@olaf.senderson
+ smtpHost: localhost
+ port: 1025
\ No newline at end of file
