diff --git a/smp-angular/src/app/common/search-table/search-table.component.html b/smp-angular/src/app/common/search-table/search-table.component.html
index 5b6b5c47eb933e92fbc1f7d55c2e8980341455d9..586c92d89be9e25bab8b97fc9fd15a7069d5dd57 100644
--- a/smp-angular/src/app/common/search-table/search-table.component.html
+++ b/smp-angular/src/app/common/search-table/search-table.component.html
@@ -32,6 +32,7 @@
</div>
<ngx-datatable #searchTable fxFlex id="searchTable"
class="expandable"
+ [messages]="datatableMessages"
[rowClass]="getRowClass"
[rows]="rows"
[columns]="columnPicker.selectedColumns"
@@ -51,7 +52,7 @@
(page)="onPage($event)"
(sort)="onSort($event)"
[selected]="selected"
- [selectionType]="'multi'"
+ [selectionType]="'single'"
(activate)="onActivate($event)"
(select)="onSelect($event)"
>
diff --git a/smp-angular/src/app/common/search-table/search-table.component.ts b/smp-angular/src/app/common/search-table/search-table.component.ts
index 9c3d40ee403376c354f56810cec1e830e5ec0c02..6f498c3ebf6c7ef957d7678bcc48a42596f38031 100644
--- a/smp-angular/src/app/common/search-table/search-table.component.ts
+++ b/smp-angular/src/app/common/search-table/search-table.component.ts
@@ -29,8 +29,6 @@ export class SearchTableComponent implements OnInit {
@ViewChild('rowActions', {static: true}) rowActions: TemplateRef<any>;
@ViewChild('rowExpand', {static: true}) rowExpand: TemplateRef<any>;
@ViewChild('rowIndex', {static: true}) rowIndex: TemplateRef<any>;
-
-
@Input() additionalToolButtons: TemplateRef<any>;
@Input() additionalRowActionButtons: TemplateRef<any>;
@Input() searchPanel: TemplateRef<any>;
@@ -71,6 +69,18 @@ export class SearchTableComponent implements OnInit {
forceRefresh: boolean = false;
showSpinner: boolean = false;
currentResult: SearchTableResult = null;
+ // override datatable messages to remove selectedMessage message
+ datatableMessages: any = {
+ // Message to show when array is presented
+ // but contains no values
+ emptyMessage: 'No data to display',
+
+ // Footer total message
+ totalMessage: 'total',
+
+ // Footer selected message
+ selectedMessage: null
+};
constructor(protected http: ExtendedHttpClient,
protected alertService: AlertMessageService,
diff --git a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html
index 289743b03b120ee4697577994962425bcac1ffd5..909c2ae65052d3c9a82c97b84647be027f238313 100644
--- a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html
+++ b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html
@@ -5,6 +5,7 @@
<button id="validateResource_id" mat-raised-button
color="primary"
matTooltip="Validate resource"
+ [disabled]="emptyDocument"
(click)="onDocumentValidateButtonClicked()"
>
<mat-icon>check_circle</mat-icon>
diff --git a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.ts b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.ts
index 234ee40028118ff917bf9b24b449524799c23f47..20c454c083dfbc8d9b743361983a3c002a0cc682 100644
--- a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.ts
+++ b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.ts
@@ -109,8 +109,13 @@ export class ResourceDocumentPanelComponent implements AfterViewInit, BeforeLeav
this.documentForm.controls['currentResourceVersion'].setValue(value.currentResourceVersion);
this.documentForm.controls['payloadVersion'].setValue(value.payloadVersion);
this.documentForm.controls['payload'].setValue(value.payload);
- this.documentForm.controls['payloadVersion'].enable();
this.documentForm.controls['payload'].enable();
+ // the method documentVersionsExists already uses the current value to check if versions exists
+ if (!this.documentVersionsExists) {
+ this.documentForm.controls['payloadVersion'].disable();
+ } else {
+ this.documentForm.controls['payloadVersion'].enable();
+ }
} else {
this.documentForm.controls['name'].setValue("");
this.documentForm.controls['payload'].setValue("");
@@ -217,6 +222,14 @@ export class ResourceDocumentPanelComponent implements AfterViewInit, BeforeLeav
return !this._document?.allVersions ? [] : this._document?.allVersions;
}
+ get emptyDocument(): boolean{
+ return !this.documentForm.controls['payload'].value
+ }
+
+ get documentVersionsExists(): boolean{
+ return this.getDocumentVersions.length > 0
+ }
+
get saveButtonDisabled(): boolean {
return !this.documentForm.dirty;
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/README.md b/smp-docker/compose/tomcat-mysql-smp-sml/README.md
index f1dbe604a816cac0ae90b13f97860e822aab0861..92ed632a812a8961a9b6d35ef7509edcbceb4e47 100755
--- a/smp-docker/compose/tomcat-mysql-smp-sml/README.md
+++ b/smp-docker/compose/tomcat-mysql-smp-sml/README.md
@@ -37,10 +37,10 @@ Password: sml
## CAS - EULOGIN
url: https://localhost:7102/cas/login
-Users:
- - user/123456
- - smp/123456
- - system/123456
+Users: (For details see the CAS configuration: [userDataBase.xml](eulogin%2Finit-data%2FuserDataBase.xml)):
+- user (Peter.PARKER@dummy-mail-not-exists.eu)/123456
+- system (Bruce.BANNER@dummy-mail-not-exists.eu)/123456
+- user-02 (Tony.STARK@dummy-mail-not-exists.eu)/123456
To use eulogin add the following hostname mappings (Linux: /etc/hosts, windows: C:\Windows\System32\drivers\etc\hosts
@@ -49,5 +49,7 @@ Users:
## Mail server
-url: http://172.19.0.2:9005/monitor
+Mock mail server for monitoring send alert mails.
+url: http://localhost:9005/monitor
+
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/userDataBase.xml b/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/userDataBase.xml
index e0b1449abc63125a854be5dcb8c406e5c4a111cd..76c373927c75709efedc1fb4653d75c68061edff 100644
--- a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/userDataBase.xml
+++ b/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/userDataBase.xml
@@ -29,7 +29,7 @@
<passwordChangeDn>uid=smp,ou=people,dc=commission,dc=europa,dc=eu</passwordChangeDn>
<strongPasswordHash>123456</strongPasswordHash>
<passwordLastChangedTime></passwordLastChangedTime>
- <uid>smp</uid>
+ <uid>user-02</uid>
<cudGroups>DIGIT_SMP_ADMIN</cudGroups>
</user>
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
index 896f709cc69c6d524cc3c9ded3cbad62c0f2417f..4ff7c85e6168e659c69f84e27722037460ed70f0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
@@ -233,7 +233,7 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> implements Initia
SMPConfigurationInitializer configurationInitializer = new SMPConfigurationInitializer(memEManager, environmentProperties);
newProperties = configurationInitializer.getDatabaseProperties();
newProperties.setLastUpdate(OffsetDateTime.now());
- } // first update deprecated values
+ }
Map<String, Object> resultProperties;
try {
@@ -282,6 +282,8 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> implements Initia
protected void setInitializedTime(OffsetDateTime dateTime) {
initiateDate = dateTime;
+ // update property listeners for the first time
+ updatePropertyListeners();
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java
index f35f4dc6f186a4686548d831c632585c99a02261..b02d5dc683f679b5f0339ea56aa8161f0ab5475a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java
@@ -319,8 +319,8 @@ public class CredentialsAlertService {
mailService.sendMail(props, mailFrom, alert.getMailTo());
updateAlertStatus(alert, AlertStatusEnum.SUCCESS, null);
} catch (Throwable exc) {
- LOG.error("Can not send mail (empty mail) for alert [{}]! Error [{}]",
- alert, ExceptionUtils.getRootCauseMessage(exc));
+ LOG.error("Can not send mail [{}] for alert [{}]! Error [{}]",
+ mailTo, alert, ExceptionUtils.getRootCauseMessage(exc));
updateAlertStatus(alert, AlertStatusEnum.FAILED, ExceptionUtils.getRootCauseMessage(exc));
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
index aa620ecac98e2e81f68e286d504e777515430efd..8965eaafad938f8d87a83f67037835f3f27a9995 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
@@ -67,9 +67,11 @@ public class MailService {
helper.setText(html, true);
helper.setSubject(model.getSubject());
helper.setFrom(from);
+ LOG.info("Send mail to : [{}:{}]",javaMailSender.getHost(),javaMailSender.getPort());
+
javaMailSender.send(message);
} catch (IOException | MessagingException | TemplateException | MailException e) {
- LOG.error("Exception while sending mail from[{}] to[{}]", from, to, e);
+ LOG.error("Exception while sending mail from [{}] to [{}]", from, to, e);
throw new SMPRuntimeException(ErrorCode.MAIL_SUBMISSION_ERROR, e, ExceptionUtils.getRootCauseMessage(e));
}
}
diff --git a/smp-server-library/src/main/resources/alert-mail-templates/credential_expired.ftl b/smp-server-library/src/main/resources/alert-mail-templates/credential_expired.ftl
index 4bc555416e37baacd990355e76788b0fad1ef56b..5240d3f2c01f5f02a5c97147e4b77459c4bff2ff 100644
--- a/smp-server-library/src/main/resources/alert-mail-templates/credential_expired.ftl
+++ b/smp-server-library/src/main/resources/alert-mail-templates/credential_expired.ftl
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>eDelivery SMP</title>
+<title>DomiSMP</title>
</head>
<body style="margin:0; padding:0; background-color: #f1f1f1;">
<center>
@@ -41,7 +41,7 @@
<!-- TITLE -->
<tr>
- <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">eDelivery SMP<br/></td>
+ <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">DomiSMP<br/></td>
</tr>
<!-- / TITLE -->
@@ -112,4 +112,4 @@
</table>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smp-server-library/src/main/resources/alert-mail-templates/credential_imminent_expiration.ftl b/smp-server-library/src/main/resources/alert-mail-templates/credential_imminent_expiration.ftl
index 8a18f1fac3fdfefc1f82786517e3e15cee444c46..16783fddd3c417964a013b56eb2907203cdbb377 100644
--- a/smp-server-library/src/main/resources/alert-mail-templates/credential_imminent_expiration.ftl
+++ b/smp-server-library/src/main/resources/alert-mail-templates/credential_imminent_expiration.ftl
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>eDelivery SMP</title>
+<title>DomiSMP</title>
</head>
<body style="margin:0; padding:0; background-color: #f1f1f1;">
<center>
@@ -41,7 +41,7 @@
<!-- TITLE -->
<tr>
- <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">eDelivery SMP<br/></td>
+ <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">DomiSMP<br/></td>
</tr>
<!-- / TITLE -->
diff --git a/smp-server-library/src/main/resources/alert-mail-templates/credential_suspended.ftl b/smp-server-library/src/main/resources/alert-mail-templates/credential_suspended.ftl
index 2847ec059df2cee28add8d407701e0a695f89c82..514c228bd358df4042ed33d4921efe83f0410224 100644
--- a/smp-server-library/src/main/resources/alert-mail-templates/credential_suspended.ftl
+++ b/smp-server-library/src/main/resources/alert-mail-templates/credential_suspended.ftl
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>eDelivery SMP</title>
+<title>DomiSMP</title>
</head>
<body style="margin:0; padding:0; background-color: #f1f1f1;">
<center>
@@ -41,7 +41,7 @@
<!-- TITLE -->
<tr>
- <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">eDelivery SMP<br/></td>
+ <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">DomiSMP<br/></td>
</tr>
<!-- / TITLE -->
@@ -115,4 +115,4 @@
</table>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smp-server-library/src/main/resources/alert-mail-templates/credential_verification_failed.ftl b/smp-server-library/src/main/resources/alert-mail-templates/credential_verification_failed.ftl
index 7e2b43928cdbadc89f19c096bc6537ca0cf4ce80..08935d815b1fb04abb84d8c8fb51fc763bac3511 100644
--- a/smp-server-library/src/main/resources/alert-mail-templates/credential_verification_failed.ftl
+++ b/smp-server-library/src/main/resources/alert-mail-templates/credential_verification_failed.ftl
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>eDelivery SMP</title>
+<title>DomiSMP</title>
</head>
<body style="margin:0; padding:0; background-color: #f1f1f1;">
<center>
@@ -41,7 +41,7 @@
<!-- TITLE -->
<tr>
- <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">eDelivery SMP<br/></td>
+ <td valign="top" align="left" style=" font-size: 30px; font-family: Arial, Helvetica, sans-serif; color: #000;">DomiSMP<br/></td>
</tr>
<!-- / TITLE -->
@@ -114,4 +114,4 @@
</table>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql b/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql
index b560056ed099d2b01f6dada215524eee387471cb..817d10fbb28e73c7f720d123da9d56813dbfc30c 100644
--- a/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql
+++ b/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql
@@ -1,11 +1,11 @@
-insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, CREATED_ON, LAST_UPDATED_ON) values
-(1, 'system', 1, 'SYSTEM_ADMIN', NOW(), NOW());
+insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, EMAIL, CREATED_ON, LAST_UPDATED_ON) values
+(1, 'system', 1, 'SYSTEM_ADMIN', 'system@mail-example.local', NOW(), NOW());
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
(2, 1, 1, 'system', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'USERNAME_PASSWORD','UI', NOW(), NOW()),
(3, 1, 1, 'pat_system', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'ACCESS_TOKEN', 'REST_API', NOW(), NOW());
-insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, CREATED_ON, LAST_UPDATED_ON) values
-(2, 'user', 1, 'USER', NOW(), NOW());
+insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, EMAIL, CREATED_ON, LAST_UPDATED_ON) values
+(2, 'user', 1, 'USER', 'user@mail-example.local', NOW(), NOW());
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
(4, 2, 1, 'user', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'USERNAME_PASSWORD','UI', NOW(), NOW()),
(5, 2, 1, 'user', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'ACCESS_TOKEN', 'REST_API', NOW(), NOW()),
diff --git a/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql b/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql
index 85be9de712c5599bb3098b43f558eeae08a0043d..f4112b2b7d68557466b24c10c3e2b0ff9c0f3824 100644
--- a/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql
+++ b/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql
@@ -40,15 +40,15 @@ DELETE FROM SMP_DOMAIN_AUD;
DELETE FROM SMP_REV_INFO;
set define off;
-insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, CREATED_ON, LAST_UPDATED_ON) values
-(1, 'system', 1, 'SYSTEM_ADMIN', sysdate, sysdate);
+insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, EMAIL, CREATED_ON, LAST_UPDATED_ON) values
+(1, 'system', 1, 'SYSTEM_ADMIN', 'system@mail-example.local', sysdate, sysdate);
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
(2, 1, 1, 'system', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'USERNAME_PASSWORD','UI', sysdate, sysdate);
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
(3, 1, 1, 'pat_system', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'ACCESS_TOKEN', 'REST_API', sysdate, sysdate);
-insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, CREATED_ON, LAST_UPDATED_ON) values
-(2, 'user', 1, 'USER', sysdate, sysdate);
+insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, EMAIL, CREATED_ON, LAST_UPDATED_ON) values
+(2, 'user', 1, 'USER', 'user@mail-example.local', sysdate, sysdate);
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
(4, 2, 1, 'user', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'USERNAME_PASSWORD','UI', sysdate, sysdate);
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
diff --git a/smp-webapp/src/main/resources/html/index.html b/smp-webapp/src/main/resources/html/index.html
index f6dd59ac8818f79dc744b01c2997becf53926e51..a1bf19155795fae71744d640c5a370058b4f1ba7 100644
--- a/smp-webapp/src/main/resources/html/index.html
+++ b/smp-webapp/src/main/resources/html/index.html
@@ -14,7 +14,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>SMP</title>
+ <title>DomiSMP</title>
<link rel="icon" type="image/x-ico" href="favicon.ico">
<style type="text/css">
body { font-family: Arial, Helvetica, sans-serif; }
@@ -26,6 +26,6 @@
<h2>Version: ${project.version}</h2>
<h6>Build timestamp: ${buildtimestamp}</h6>
<h6>Specification: <a href="http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html" target="_blank">http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html</a></h6>
- <h6>UI: <a href="ui/index.html" target="_blank">eDelivery SMP</a></h6>
+ <h6>UI: <a href="ui/index.html" target="_blank">DomiSMP</a></h6>
</body>
</html>
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql
index 8e5224b6739df102b3386bc3209fd486a58d2ef7..2233655cc7ad59974588291ded4d331b582ccb97 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql
@@ -1,12 +1,11 @@
-insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, CREATED_ON, LAST_UPDATED_ON) values
-(1, 'system', 1, 'SYSTEM_ADMIN', NOW(), NOW()),
-(2, 'user', 1, 'USER', NOW(), NOW());
+insert into SMP_USER (ID, USERNAME, ACTIVE, APPLICATION_ROLE, EMAIL, CREATED_ON, LAST_UPDATED_ON) values
+(1, 'system', 1, 'SYSTEM_ADMIN','system@mail-example.local', NOW(), NOW()),
+(2, 'user', 1, 'USER', 'user@mail-example.local', NOW(), NOW());
insert into SMP_CREDENTIAL (ID, FK_USER_ID, CREDENTIAL_ACTIVE, CREDENTIAL_NAME, CREDENTIAL_VALUE, CREDENTIAL_TYPE, CREDENTIAL_TARGET, CREATED_ON, LAST_UPDATED_ON) values
(1, 1, 1, 'system', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'USERNAME_PASSWORD','UI', NOW(), NOW()),
(2, 2, 1, 'user', '$2a$06$FDmjewn/do3C219uysNm9.XG8mIn.ubHnMydAzC8lsv61HsRpOR36', 'USERNAME_PASSWORD','UI', NOW(), NOW());
-
insert into SMP_DOMAIN (ID, DOMAIN_CODE, VISIBILITY, SML_SUBDOMAIN, SML_SMP_ID, SIGNATURE_KEY_ALIAS, SML_CLIENT_KEY_ALIAS, SML_CLIENT_CERT_AUTH,SML_REGISTERED, CREATED_ON, LAST_UPDATED_ON) values
(1, 'testdomain','PUBLIC', 'test-domain', 'DOMI-SMP-001','sample_key','smp_domain_01',1,1, NOW(), NOW());
insert into SMP_GROUP (ID, FK_DOMAIN_ID, NAME, VISIBILITY, CREATED_ON, LAST_UPDATED_ON) values