Merge branch 'dev'

Change-Id: Ief4f86b5dc76bc2bda340cf46e0e14c1ef23eb40

11 files changed, 54 insertions, 87 deletions

diff --git a/README.md b/README.md
index 19f6b410..ba6c9999 100644
--- a/README.md
+++ b/README.md
@@ -81,9 +81,9 @@ Make sure to restart Glassfish after this change.
 In versions 5.0.0M1, 0.10 and older the configuration of a custom login realm was neccessary. If you configured your glassfish instance
 for one of these version, you can remove the old configuration options and artifact, as they are no longer needed:
 
-* **delete** the jar file **org.eclipse.mdm.realm.login.glassfish-VERSION.jar** from **GLASSFISH4_ROOT/glassfish/domains/domain1/lib**
+* **delete** the jar file **org.eclipse.mdm.realm.login.glassfish-VERSION.jar** from **GLASSFISH_ROOT/glassfish/domains/domain1/lib**
    
-* **open** the Glassfish login **configuration file** at **GLASSFISH4_ROOT/glassfish/domains/domain1/config/login.conf**
+* **open** the Glassfish login **configuration file** at **GLASSFISH_ROOT/glassfish/domains/domain1/config/login.conf**
    
 * **delete** custom MDM realm module entry to this config file
     
diff --git a/build.gradle b/build.gradle
index 3696589f..50f913ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@
  ********************************************************************************/
  
 group = 'org.eclipse.mdm'
-version = '5.1.0M3'
+version = '5.1.0M4-SNAPSHOT'
 
 description = 'mdm nucleus'
 apply plugin: 'war'
diff --git a/doc/GettingStarted_mdmbl.pdf b/doc/GettingStarted_mdmbl.pdf
index 99373f37..255f2af1 100644
--- a/doc/GettingStarted_mdmbl.pdf
+++ b/doc/GettingStarted_mdmbl.pdf
diff --git a/doc/Installation Guide for the openMDM5 Application.pdf b/doc/Installation Guide for the openMDM5 Application.pdf
index d8772a90..3b34f327 100644
--- a/doc/Installation Guide for the openMDM5 Application.pdf
+++ b/doc/Installation Guide for the openMDM5 Application.pdf
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
index 09de44d5..5d854d99 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
@@ -28,7 +28,7 @@ import { ComponentLoaderFactory } from 'ngx-bootstrap/component-loader';
 import { BsDropdownModule } from 'ngx-bootstrap';
 
 import { TreeModule, DataTableModule, SharedModule, ContextMenuModule } from 'primeng/primeng';
-import { GrowlModule, DropdownModule, MultiSelectModule } from 'primeng/primeng';
+import { GrowlModule, DropdownModule, MultiSelectModule, CalendarModule } from 'primeng/primeng';
 
 import { PropertyService } from './property.service';
 import { PreferenceService } from './preference.service';
@@ -85,6 +85,7 @@ export function streamTranslate(translateService: TranslateService, keys: string
     ModalModule,
     DropdownModule,
     MultiSelectModule,
+    CalendarModule,
     TreeModule,
     DataTableModule,
     SharedModule,
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts
index e7c3b4f1..392b7e1e 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.module.ts
@@ -20,7 +20,6 @@ import { MDMCoreModule } from '../core/mdm-core.module';
 
 import { MDMSearchComponent } from './mdm-search.component';
 import { SearchConditionComponent } from './search-condition.component';
-import { SearchDatepickerComponent } from './search-datepicker.component';
 import { EditSearchFieldsComponent } from './edit-searchFields.component';
 
 import { TableViewModule } from '../tableview/tableview.module';
@@ -40,7 +39,6 @@ import {AutoCompleteModule} from 'primeng/primeng';
   declarations: [
     MDMSearchComponent,
     SearchConditionComponent,
-    SearchDatepickerComponent,
     EditSearchFieldsComponent,
   ],
   exports: [
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html
index 1a0355c9..b653b3d2 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.html
@@ -39,7 +39,17 @@
     [disabled]="disabled"
     (keyup.enter)="onEnter($event)">
   </p-autoComplete>
-  <div search-datepicker *ngSwitchCase="'date'" (onSetValue)="setValue($event)" style="width: 100%" [disabled]="disabled" [initialValue]="condition.value"></div>
+  <p-calendar *ngSwitchCase="'date'" 
+    (ngModelChange)="setDateValue($event)" 
+    [ngModel]="dateValue" 
+    dateFormat="dd.mm.yy" 
+    showTime="true" 
+    hourFormat="24" 
+    hideOnDateTimeSelect="true" 
+    [showIcon]="true" 
+    [disabled]="disabled"
+    [ngStyle]="{ 'width': '100%' }">
+  </p-calendar>
   <input *ngSwitchDefault type="text" class="form-control input-sm" placeholder="Wert" [value]="condition.value" (input)="setValue($event.target.value)" [disabled]="disabled">
 </td>
 <td style="vertical-align: middle"><button id="remove" type="button" class="btn btn-default btn-sm fa fa-times remove" (click)="remove()" [disabled]="disabled"></button></td>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts
index 276735a8..be834b46 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-condition.component.ts
@@ -26,6 +26,7 @@ import {AutoComplete} from 'primeng/primeng';
 import {MDMNotificationService} from '../core/mdm-notification.service';
 
 import {TranslateService} from '@ngx-translate/core';
+import { DatePipe } from '@angular/common';
 
 @Component({
   selector: '[search-condition]',
@@ -44,6 +45,7 @@ export class SearchConditionComponent implements OnChanges, AfterViewInit {
   suggestions: string[];
   displayedSuggestions: string[] = [];
   lastQuery: string;
+  dateValue: Date;
 
   @ViewChild(AutoComplete) primeAutoCompleteComponent: AutoComplete;
 
@@ -51,7 +53,8 @@ export class SearchConditionComponent implements OnChanges, AfterViewInit {
               private prop: PropertyService,
               private queryService: QueryService,
               private notificationService: MDMNotificationService,
-              private translateService: TranslateService) { }
+              private translateService: TranslateService,
+              private datePipe: DatePipe) { }
 
   ngAfterViewInit() {
     if (this.primeAutoCompleteComponent) {
@@ -76,6 +79,16 @@ export class SearchConditionComponent implements OnChanges, AfterViewInit {
     if (changes['selectedEnvs'] && this.condition.valueType === 'string') {
       this.setAutoCompleteValues();
     }
+
+    if (this.condition.valueType === 'date') {
+      console.log(this.condition.value[0]);
+      if (this.condition.value === undefined || this.condition.value[0] === undefined) {
+        this.dateValue = new Date();
+        (<Date> this.dateValue).setHours(0, 0, 0, 0);
+      } else {
+        this.dateValue = new Date(this.condition.value[0]);
+      }
+    }
   }
 
   onEnter(e: Event) {
@@ -130,6 +143,11 @@ export class SearchConditionComponent implements OnChanges, AfterViewInit {
     this.condition.value = value;
   }
 
+  setDateValue(value: Date) {
+    console.log(value);
+    this.condition.value = [this.datePipe.transform(value, 'yyyy-MM-dd' + 'T' + 'HH:mm:ss')];
+  }
+
   remove() {
     this.onRemove.emit(this.condition);
   }
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-datepicker.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-datepicker.component.html
deleted file mode 100644
index fc045aec..00000000
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-datepicker.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************-->
-
-<div class="input-group" dropdown style="width: 100%">
-  <input type="text" class="form-control input-sm" placeholder="{{ 'search.search-datepicker.placeholder-dateformat' | translate }}" [value]="date | date:'dd.MM.yyyy HH:mm'" (input)="setDate($event.target.value)" [disabled]="disabled">
-  <span *ngIf="!disabled" class="input-group-addon"  title="{{ 'search.search-datepicker.tooltip-select-date' | translate }}" style="cursor:pointer; border-radius: 4px; padding-right: 12px; width: 1%; border-top-left-radius: 0; border-bottom-left-radius: 0;" dropdownToggle>
-    <em class="fa fa-calendar"></em>
-  </span>
-  <span *ngIf="disabled" class="input-group-addon" style="cursor: not-allowed; border-radius: 4px; padding-right: 12px; width: 1%; border-top-left-radius: 0; border-bottom-left-radius: 0;">
-    <em class="fa fa-calendar"></em>
-  </span>
-  <ul class="dropdown-menu" *dropdownMenu>
-    <datepicker [(ngModel)]="date" [showWeeks]="false" (selectionDone)="onSelectionDone($event);"></datepicker>
-  </ul>
-</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-datepicker.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-datepicker.component.ts
deleted file mode 100644
index fecf3ba2..00000000
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/search-datepicker.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-
-import {Component, OnInit, Output, Input, EventEmitter} from '@angular/core';
-import { DatePipe } from '@angular/common';
-
-@Component({
-  selector: '[search-datepicker]',
-  templateUrl: 'search-datepicker.component.html'
-})
-export class SearchDatepickerComponent implements OnInit {
-
-  @Output() onSetValue = new EventEmitter<string>();
-  @Input() disabled = false;
-  @Input() initialValue: string[];
-
-  date: any;
-  constructor(private datePipe: DatePipe) {}
-
-  ngOnInit() {
-    if (this.initialValue.length > 0) {
-      this.date = this.initialValue[0];
-      this.setDate(this.initialValue[0]);
-    }
-  }
-
-  setDate(inputDate: string) {
-    let dateString = inputDate.split(' ')[0];
-    let days = dateString.split('.')[0];
-    let month = dateString.split('.')[1];
-    let year = dateString.split('.')[2];
-    let timeString = inputDate.split(' ')[1];
-    let date = new Date([month, days, year].join('.') + ' ' + timeString);
-    if (date.toString() !== 'Invalid Date') { this.onSelectionDone(date); };
-  }
-
-  onSelectionDone(date: Date) {
-    this.onSetValue.emit(this.datePipe.transform(date, 'yyyy-MM-dd' + 'T' + 'HH:mm:ss'));
-  }
-
-}
diff --git a/release_notes.md b/release_notes.md
index 57192721..0e91121d 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -4,6 +4,25 @@
 * [mdmbl Eclipse Git Repositories](http://git.eclipse.org/c/?q=mdmbl)
 * [mdmbl nightly builds - last stable version](http://download.eclipse.org/mdmbl/nightly_master/?d)
 
+## Version 5.1.0M4, 2019/08/09 ##
+
+New Features:
+ * Glassfish 5 Support
+
+
+### API changes ###
+
+* no
+
+### Changes ###
+
+*  [548241](https://bugs.eclipse.org/bugs/show_bug.cgi?id=548241) - Test nucleus with Eclipse Glassfish 5.1
+
+### Bugzilla Bugs fixed ###
+
+* [548347](https://bugs.eclipse.org/bugs/show_bug.cgi?id=548347) - Advanced search with date attribute fails if time portion is omitted in input field
+* [547115](https://bugs.eclipse.org/bugs/show_bug.cgi?id=547115) - ClassCastException in ReadRequestHandler#getODSColumns
+
 ## Version 5.1.0M3, 2019/04/23 ##
 
 New Features: