From f8490cbc2b55dff742386ce6190527600f1ff8b7 Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 10:58:37 +0300
Subject: [PATCH 1/9] Minor edit

---
 .../java/dao/entities/DMPResearcherDao.java    |  4 ++++
 .../dao/entities/DMPResearcherDaoImpl.java     | 18 ++++++++++++++++++
 .../main/java/dao/entities/RegistryDao.java    |  2 ++
 .../java/dao/entities/RegistryDaoImpl.java     |  3 ++-
 .../main/java/dao/entities/ResearcherDao.java  |  2 ++
 .../java/dao/entities/ResearcherDaoImpl.java   | 10 ++++++++++
 .../main/java/rest/entities/Researchers.java   | 12 ++++++++++++
 7 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java b/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java
index db9537448..c97e6c78d 100644
--- a/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java
+++ b/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java
@@ -4,7 +4,11 @@ import java.util.UUID;
 
 import dao.Dao;
 import entities.DMPResearcher;
+import entities.Researcher;
 
 public interface DMPResearcherDao extends Dao<DMPResearcher, UUID> {
 
+	
+	Researcher getResearcherByEmail(String email);
+	
 }
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java b/dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java
index e7f469c46..1c420680b 100644
--- a/dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java
@@ -2,9 +2,13 @@ package dao.entities;
 
 import java.util.UUID;
 
+import javax.persistence.TypedQuery;
+
+import org.hibernate.NonUniqueResultException;
 
 import dao.JpaDao;
 import entities.DMPResearcher;
+import entities.Researcher;
 
 public class DMPResearcherDaoImpl extends JpaDao<DMPResearcher, UUID> implements DMPResearcherDao {
 
@@ -12,6 +16,20 @@ public class DMPResearcherDaoImpl extends JpaDao<DMPResearcher, UUID> implements
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	@Override
+	public Researcher getResearcherByEmail(String email) {
+		String queryString = "FROM Researcher researcher where primaryEmail=:email";
+		TypedQuery<Researcher> typedQuery = entityManager.createQuery(queryString, Researcher.class);
+		typedQuery.setParameter("email", email);
+		try {
+			return typedQuery.getSingleResult();
+		}catch(Exception ex) {
+			System.out.println(ex.getMessage());
+			return null;
+		}
+		
+	}
 	
 
 }
diff --git a/dmp-backend/src/main/java/dao/entities/RegistryDao.java b/dmp-backend/src/main/java/dao/entities/RegistryDao.java
index a4d921610..eebeed1fe 100644
--- a/dmp-backend/src/main/java/dao/entities/RegistryDao.java
+++ b/dmp-backend/src/main/java/dao/entities/RegistryDao.java
@@ -5,6 +5,7 @@ import java.util.UUID;
 
 import dao.Dao;
 import entities.Registry;
+import entities.Researcher;
 import entities.responses.IDLabelPair;
 
 public interface RegistryDao extends Dao<Registry, UUID> {
@@ -12,5 +13,6 @@ public interface RegistryDao extends Dao<Registry, UUID> {
 	List<UUID> listAllIDs();
 
 	List<IDLabelPair> listAllIDsLabels();
+	
 
 }
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java b/dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java
index dc59ec05a..1c8bb1a17 100644
--- a/dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java
@@ -10,6 +10,7 @@ import org.hibernate.query.Query;
 
 import dao.JpaDao;
 import entities.Registry;
+import entities.Researcher;
 import entities.responses.IDLabelPair;
 
 public class RegistryDaoImpl extends JpaDao<Registry, UUID> implements RegistryDao {
@@ -37,6 +38,6 @@ public class RegistryDaoImpl extends JpaDao<Registry, UUID> implements RegistryD
 		})
 		.collect(Collectors.toList());
 	}
-	
+
 
 }
diff --git a/dmp-backend/src/main/java/dao/entities/ResearcherDao.java b/dmp-backend/src/main/java/dao/entities/ResearcherDao.java
index 16e74cd34..1cf3913ed 100644
--- a/dmp-backend/src/main/java/dao/entities/ResearcherDao.java
+++ b/dmp-backend/src/main/java/dao/entities/ResearcherDao.java
@@ -12,5 +12,7 @@ public interface ResearcherDao extends Dao<Researcher, UUID> {
 	List<UUID> listAllIDs();
 
 	List<IDLabelPair> listAllIDsLabels();
+	
+	Researcher getResearcherByEmail(String email);
 
 }
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java b/dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java
index bdf592e21..6a9d78691 100644
--- a/dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java
@@ -38,6 +38,16 @@ public class ResearcherDaoImpl extends JpaDao<Researcher, UUID> implements Resea
 		})
 		.collect(Collectors.toList());
 	}
+
+
+	@Override
+	public Researcher getResearcherByEmail(String email) {
+		String queryString = "FROM Researcher researcher where researcher.primaryEmail=:email";
+		TypedQuery<Researcher> typedQuery = entityManager.createQuery(queryString, Researcher.class);
+		
+		
+		return null;
+	}
 	
 	
 }
diff --git a/dmp-backend/src/main/java/rest/entities/Researchers.java b/dmp-backend/src/main/java/rest/entities/Researchers.java
index ef659665c..c38840d60 100644
--- a/dmp-backend/src/main/java/rest/entities/Researchers.java
+++ b/dmp-backend/src/main/java/rest/entities/Researchers.java
@@ -96,6 +96,18 @@ public class Researchers  {
 		}
 	}
 	
+	@RequestMapping(method = RequestMethod.GET, value = { "/researcher/getByEmail" }, produces="application/json")
+	public @ResponseBody ResponseEntity<Object> getResearcherByEmail(@RequestParam("email") String email){
+		try {
+			Researcher researcher = researcherDao.getResearcherByEmail(email);
+			return ResponseEntity.status(HttpStatus.OK).body(new ObjectMapper().writeValueAsString(researcher));
+		}
+		catch(Exception ex) {
+			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage());
+		}
+		
+	}
+	
 
 	@RequestMapping(method = RequestMethod.GET, value = { "/researcher/getAll" }, produces="application/json")
 	public @ResponseBody ResponseEntity<Object> getAllResearchers(){

From 3c8e6629cb9086f029d8e8405edef90439f3c5ec Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 11:29:22 +0300
Subject: [PATCH 2/9] changes

---
 dmp-admin/src/app/app.module.ts               |   9 +-
 .../main-window/main-window.component.html    |   6 +-
 .../datarepos-editor.component.css            |  33 +++++
 .../datarepos-editor.component.html           | 122 ++++++++++++++++
 .../datarepos-editor.component.spec.ts        |  25 ++++
 .../datarepos-editor.component.ts             | 137 ++++++++++++++++++
 .../dmp-editor/dmp-editor.component.html      |   2 +
 .../dmp-editor/dmp-editor.component.ts        |   1 +
 .../dmp-profile-editor.component.html         |   2 +
 .../dmp-profile-editor.component.ts           |   1 +
 .../organisation-editor.component.html        |   2 +
 .../organisation-editor.component.ts          |   3 +-
 .../project-editor.component.html             |   2 +
 .../registry-editor.component.html            |   2 +
 .../registry-editor.component.ts              |   4 +-
 .../researcher-editor.component.html          |   2 +
 .../researcher-editor.component.ts            |   1 +
 .../service-editor.component.html             |   2 +
 .../app/pipes/datarepo-table-filter.pipe.ts   |  29 ++++
 dmp-admin/src/app/routes.ts                   |   5 +
 .../src/app/services/datarepo-service.ts      |  46 ++++++
 dmp-backend/package-lock.json                 |   3 +
 .../src/app/form/dynamic-form.component.ts    |  13 ++
 23 files changed, 445 insertions(+), 7 deletions(-)
 create mode 100644 dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.css
 create mode 100644 dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.html
 create mode 100644 dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.spec.ts
 create mode 100644 dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.ts
 create mode 100644 dmp-admin/src/app/pipes/datarepo-table-filter.pipe.ts
 create mode 100644 dmp-admin/src/app/services/datarepo-service.ts
 create mode 100644 dmp-backend/package-lock.json

diff --git a/dmp-admin/src/app/app.module.ts b/dmp-admin/src/app/app.module.ts
index 615c8976a..ad2600e98 100644
--- a/dmp-admin/src/app/app.module.ts
+++ b/dmp-admin/src/app/app.module.ts
@@ -23,6 +23,7 @@ import { ResearcherService } from './services/researcher-service';
 import { OrganisationService } from './services/organisation-service';
 import { DmpProfileService } from './services/dmpprofile-service';
 import { RegistryService } from './services/registry-service';
+import { DatarepoService } from './services/datarepo-service';
 import { Toolbox } from './services/toolbox';
 
 import { DataFilterPipe }   from './pipes/data-filter.pipe';
@@ -33,6 +34,7 @@ import { ProjectTableFilterPipe } from './pipes/project-table-filter.pipe';
 import { RegistryTableFilterPipe } from './pipes/registry-table-filter.pipe';
 import { OrganisationTableFilterPipe } from './pipes/organisation-table-filter.pipe';
 import { ResearcherTableFilterPipe } from './pipes/researcher-table-filter.pipe';
+import { DatarepoTableFilterPipe } from './pipes/datarepo-table-filter.pipe';
 
 
 import { GooggleSignInComponent } from './login/googgle-sign-in/googgle-sign-in.component';
@@ -53,6 +55,7 @@ import { OrganisationEditorComponent } from './managers/organisation-editor/orga
 import { RegistryEditorComponent } from './managers/registry-editor/registry-editor.component';
 import { ServiceEditorComponent } from './managers/service-editor/service-editor.component';
 import { ResearcherEditorComponent } from './managers/researcher-editor/researcher-editor.component';
+import { DatareposEditorComponent } from './managers/datarepos-editor/datarepos-editor.component';
 
 
 
@@ -66,6 +69,7 @@ import { ResearcherEditorComponent } from './managers/researcher-editor/research
     RegistryTableFilterPipe,
     ServiceTableFilterPipe,
     ResearcherTableFilterPipe,
+    DatarepoTableFilterPipe,
     
     AppComponent,
     GooggleSignInComponent,
@@ -82,7 +86,8 @@ import { ResearcherEditorComponent } from './managers/researcher-editor/research
     RegistryEditorComponent,
     ServiceEditorComponent,
     MainSignInComponent,
-    ResearcherEditorComponent
+    ResearcherEditorComponent,
+    DatareposEditorComponent
   ],
   imports: [
     BrowserModule,
@@ -97,7 +102,7 @@ import { ResearcherEditorComponent } from './managers/researcher-editor/research
     AppRouting
   ],
   providers: [ DatasetsServiceService, TokenService, DmpsServiceService, ResearcherService,
-              DialogService, DatasetProfileService, ProjectService, OrganisationService, 
+              DialogService, DatasetProfileService, ProjectService, OrganisationService, DatarepoService,
               DmpProfileService, RegistryService, ServiceService, NativeLoginService, HttpModule, Toolbox, HttpClient, RestBase],
   bootstrap: [AppComponent]
 })
diff --git a/dmp-admin/src/app/main-window/main-window.component.html b/dmp-admin/src/app/main-window/main-window.component.html
index 54c8892b4..7749f27fb 100644
--- a/dmp-admin/src/app/main-window/main-window.component.html
+++ b/dmp-admin/src/app/main-window/main-window.component.html
@@ -23,11 +23,11 @@
                       <li [ngClass]="{true:'active'}[currentlySelected=='dmpprofiles']" (click)="setActive('dmpprofiles')" [routerLink]="['/dmpprofiles']">DMP profiles</li>
                     </ul>
     
-                    <li data-toggle="collapse" data-target="#data-repositories" class="collapsed">
+                    <li data-toggle="collapse" data-target="#manage-repositories" class="collapsed">
                         <a style="cursor:pointer"><i class="fa fa-database"></i> Manage Data Repositories <span class="arrow"></span></a>
                     </li>
-                    <ul class="sub-menu collapse" id="data-repositories">
-                      <li>Data Repositories</li>
+                    <ul class="sub-menu collapse" id="manage-repositories">
+                      <li [ngClass]="{true:'active'}[currentlySelected=='datarepos']" (click)="setActive('datarepos')" [routerLink]="['/datarepos']">Data Repositories</li>
                       <li>Non-assigned repositories</li>
                     </ul>
 
diff --git a/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.css b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.css
new file mode 100644
index 000000000..002b130b0
--- /dev/null
+++ b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.css
@@ -0,0 +1,33 @@
+.invisible {
+    display:none;
+}
+
+.visible {
+    display:block;
+}
+
+tr.hover:hover > * {
+    background-color: #eeeeee;
+}
+
+.editor-container{
+    padding-top: 10px;
+    padding-right: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+}
+
+.button-150px {
+    max-width: 150px;
+}
+
+.ng-template{
+    text-align: right;
+}
+
+.grayout-empty-table {
+    opacity: 0.6; /* Real browsers */
+    filter: alpha(opacity = 60); /* MSIE */
+    text-align: center; 
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.html b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.html
new file mode 100644
index 000000000..b1f417990
--- /dev/null
+++ b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.html
@@ -0,0 +1,122 @@
+
+<div class="editor-container container">
+    
+      <div [ngClass]="{true:'visible', false:'invisible'}[tableVisible]">
+        <table class="table table-striped" [mfData]="tableData | datarepoTableFilter : filterQuery" #mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
+          <thead>
+              <tr>
+                  <th colspan="1">
+                      <input class="form-control" [(ngModel)]="filterQuery" placeholder='Filter'/>
+                  </th>
+                  <th>
+                      <button class="btn btn-default" (click)="refreshTable($event)">
+                          <span class="glyphicon glyphicon-refresh"></span>
+                        </button>
+                  </th>
+              </tr>
+              <tr>
+                <th [ngClass]="{true:'visible', false:'invisible'}[showIDs]"><mfDefaultSorter by="id">ID</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="label">Label</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="abbreviation">Abbreviation</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="reference">Reference</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="uri">Uri</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="definition">Definition</mfDefaultSorter></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr class="grayout-empty-table" *ngIf="!mf.data[0]" [contextMenu]="basicMenu" [contextMenuSubject]="datarepo"> <td colspan="5">No elements</td></tr>
+                
+              <tr *ngFor="let datarepo of mf.data" class="hover" [contextMenu]="basicMenu" [contextMenuSubject]="datarepo">
+                <td [ngClass]="{true:'visible', false:'invisible'}[showIDs]">{{datarepo.id}}</td>
+                <td>{{datarepo?.label}}</td>
+                <td>{{datarepo?.abbreviation}}</td>
+                <td>{{datarepo?.reference}}</td>
+                <td>{{datarepo?.uri}}</td>
+                <td>{{datarepo?.definition}}</td>
+              </tr>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td colspan="5">
+                        <mfBootstrapPaginator [rowsOnPageSet]="[10,20,40]"></mfBootstrapPaginator>
+                    </td>
+                </tr>
+                </tfoot>
+        </table>
+      </div>
+    
+      <!-- this is the dmp editor -->
+      <div [ngClass]="{true:'visible', false:'invisible'}[editorVisible]">
+    
+        <div> <!-- form container -->
+            <div style="display:block;">
+              <button (click)="switchToTable()" class="btn btn-lg btn-success pull-right" style="max-width:120px;">
+                  <span class="glyphicon glyphicon-arrow-left"></span> Go back
+              </button>
+            </div>
+            <form [formGroup]="datarepoEditorForm" novalidate style="display:block;">
+                <div class="form-group" [ngClass]="{null:'invisible'}[editingDatarepo?.id]">
+                  <label class="center-block">ID: {{editingDatarepo?.id}}
+                    <input class="form-control invisible" formControlName="id" [ngModel]="editingDatarepo?.id">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Label:
+                    <input class="form-control" formControlName="label" [ngModel]="editingDatarepo?.label" (ngModelChange)="editingDatarepo.label=$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Abbreviation:
+                    <input class="form-control" formControlName="abbreviation" [ngModel]="editingDatarepo?.abbreviation" (ngModelChange)="editingDatarepo.abbreviation=$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Reference:
+                    <input class="form-control" formControlName="reference" [ngModel]="editingDatarepo?.reference" (ngModelChange)="editingDatarepo.reference$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Uri:
+                    <input class="form-control" formControlName="uri" [ngModel]="editingDatarepo?.uri" (ngModelChange)="editingDatarepo.uri$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Definition:
+                    <input class="form-control" formControlName="definition" [ngModel]="editingDatarepo?.definition" (ngModelChange)="editingDatarepo.definition$event">
+                  </label>
+                </div>
+                <div class="form-group" style="width:540px;">
+                  <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
+                </div>
+            </form>
+            <!--
+            <p>Form value: {{ datarepoEditorForm.value | json }}</p>
+            -->
+        </div>
+        
+      </div>
+      
+    </div>
+    
+    
+    
+    <context-menu>
+        <ng-template contextMenuItem [subMenu]="manage"> 
+            <span></span>Manage data repositories
+        </ng-template>
+        <context-menu #manage>
+            <ng-template contextMenuItem (execute)="newDatarepo($event?.item)"> 
+                <span class="glyphicon glyphicon-plus"></span>Create data repository
+            </ng-template>
+            <ng-template contextMenuItem (execute)="editDatarepo($event?.item?.id)"> 
+                <span class="glyphicon glyphicon-pencil"></span>Edit this data repository
+            </ng-template>
+            <ng-template contextMenuItem (execute)="delete($event?.item?.id)">
+                <span class="glyphicon glyphicon-trash red"></span> Delete this
+            </ng-template>
+        </context-menu>
+        <ng-template contextMenuItem> 
+            <span></span>Show full tree connections
+        </ng-template>
+    </context-menu>
+    
\ No newline at end of file
diff --git a/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.spec.ts b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.spec.ts
new file mode 100644
index 000000000..c478b99c0
--- /dev/null
+++ b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DatareposEditorComponent } from './datarepos-editor.component';
+
+describe('DatareposEditorComponent', () => {
+  let component: DatareposEditorComponent;
+  let fixture: ComponentFixture<DatareposEditorComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DatareposEditorComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatareposEditorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.ts b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.ts
new file mode 100644
index 000000000..318edd318
--- /dev/null
+++ b/dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.ts
@@ -0,0 +1,137 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { DatarepoService } from '../../services/datarepo-service';
+import { ContextMenuComponent } from 'ngx-contextmenu';
+import { ReactiveFormsModule } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+
+import '../../../assets/custom.js';
+declare function simple_notifier(type: string, title: string, message:string): any;
+
+@Component({
+  selector: 'app-datarepos-editor',
+  templateUrl: './datarepos-editor.component.html',
+  styleUrls: ['./datarepos-editor.component.css']
+})
+export class DatareposEditorComponent implements OnInit {
+
+  constructor(private datarepoService : DatarepoService,  private fb: FormBuilder) {
+
+  }
+
+  //whole dmp data model
+  tableData : any[] = new Array();
+  
+  //datarepos editor data model
+  editingDatarepo: any = {};
+  datarepoEditorForm : any;
+
+  //required by the table
+  public filterQuery = "";
+  public rowsOnPage = 10;
+  //public sortBy = "email";
+  public sortOrder = "asc";
+
+  //visibility rules for containers
+  tableVisible: boolean = true;
+  editorVisible: boolean = false;
+
+
+  // for tableIds
+  showIDs : boolean = false;
+
+
+
+  ngOnInit() {
+    this.getAllDatarepos(false);
+    this.createDatareposEditorForm();
+  }
+
+  createDatareposEditorForm(){
+    this.datarepoEditorForm = this.fb.group({
+      id: null,
+      label: ['', Validators.required ],
+      abbreviation: '',
+      reference: '',
+      uri: '',
+      definition: ''
+    });
+
+  }
+
+  switchToTable(){
+    this.tableVisible = true;
+    this.editorVisible = false;
+  }
+
+  switchToEditor(datarepoID){
+
+    this.tableVisible = false;
+    this.editorVisible = true;
+    if(datarepoID == null){
+      this.editingDatarepo = {id: null, label: "", abbreviation: "", reference: "", uri: "", definition: "" };
+    }
+    else{
+      this.editingDatarepo = this.tableData.filter((datarepo) => datarepo.id === datarepoID)[0];
+    }
+  }
+
+
+  getAllDatarepos(showNotification : boolean){
+    this.datarepoService.getAllDatarepos().subscribe( (data) => {
+      this.tableData = data;
+      if(showNotification)
+        simple_notifier("info",null,"Refreshed the table");
+    });
+  }
+
+
+  editDatarepo(datarepo){
+    this.switchToEditor(datarepo);
+  }
+
+  newDatarepo(){
+    this.switchToEditor(null);
+  }
+
+
+
+  save(mouseEvent){
+    this.datarepoService.create(this.datarepoEditorForm.value).subscribe( 
+      response => {
+        simple_notifier("success",null,"Saved data repository");
+        this.getAllDatarepos(false);
+        this.switchToTable();
+      },
+      err => {
+        simple_notifier("danger",null,"Could not save data repository");
+      }
+    );
+  }
+
+  delete(datarepo){
+    this.datarepoService.delete(datarepo).subscribe(
+      (response) => {
+        simple_notifier("success",null,"Deleted data repository");
+        this.getAllDatarepos(false);
+        this.switchToTable();
+      },
+      (err) => {
+        simple_notifier("danger",null,"Could not delete data repository");
+      }
+    )
+  }
+
+
+
+  refreshTable($event){
+    this.getAllDatarepos(true);
+  }
+
+
+  @ViewChild(ContextMenuComponent) public basicMenu: ContextMenuComponent;
+
+
+
+
+
+}
diff --git a/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.html b/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.html
index 9dab2d93e..1a553928c 100644
--- a/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.html
+++ b/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.html
@@ -102,7 +102,9 @@
               <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
             </div>
         </form>
+        <!--
         <p>Form value: {{ dmpEditorForm.value | json }}</p>
+        -->
     </div>
 
   </div>
diff --git a/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.ts b/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.ts
index 0c77497ad..c31986221 100644
--- a/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.ts
+++ b/dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.ts
@@ -125,6 +125,7 @@ export class DmpEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved dmp");
         this.getAllDmps(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save dmp");
diff --git a/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.html b/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.html
index daaaada5e..2331ac389 100644
--- a/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.html
+++ b/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.html
@@ -67,7 +67,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ dmpProfileEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>
diff --git a/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.ts b/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.ts
index 42ad076ec..e246ceb29 100644
--- a/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.ts
+++ b/dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.ts
@@ -100,6 +100,7 @@ export class DmpProfileEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved DMP Profile");
         this.getAllDmpProfiles(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save DMP Profile");
diff --git a/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.html b/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.html
index 25f4e355a..3d44e536a 100644
--- a/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.html
+++ b/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.html
@@ -89,7 +89,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ organisationEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>
diff --git a/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.ts b/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.ts
index d91a877b5..ae3012350 100644
--- a/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.ts
+++ b/dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.ts
@@ -100,6 +100,7 @@ export class OrganisationEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved organisation");
         this.getAllOrganisations(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save organisation");
@@ -111,7 +112,7 @@ export class OrganisationEditorComponent implements OnInit {
     this.organisationService.delete(organisation).subscribe(
       (response) => {
         simple_notifier("success",null,"Deleted organisation");
-        this.refreshTable(false);
+        this.getAllOrganisations(false);
         this.switchToTable();
       },
       (err) => {
diff --git a/dmp-admin/src/app/managers/project-editor/project-editor.component.html b/dmp-admin/src/app/managers/project-editor/project-editor.component.html
index 02a624ad6..171f27c51 100644
--- a/dmp-admin/src/app/managers/project-editor/project-editor.component.html
+++ b/dmp-admin/src/app/managers/project-editor/project-editor.component.html
@@ -88,7 +88,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ projectEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>
diff --git a/dmp-admin/src/app/managers/registry-editor/registry-editor.component.html b/dmp-admin/src/app/managers/registry-editor/registry-editor.component.html
index 7dce4cf63..133d5abab 100644
--- a/dmp-admin/src/app/managers/registry-editor/registry-editor.component.html
+++ b/dmp-admin/src/app/managers/registry-editor/registry-editor.component.html
@@ -88,7 +88,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ registryEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>
diff --git a/dmp-admin/src/app/managers/registry-editor/registry-editor.component.ts b/dmp-admin/src/app/managers/registry-editor/registry-editor.component.ts
index 31df22a8d..d80d5cb34 100644
--- a/dmp-admin/src/app/managers/registry-editor/registry-editor.component.ts
+++ b/dmp-admin/src/app/managers/registry-editor/registry-editor.component.ts
@@ -102,6 +102,8 @@ export class RegistryEditorComponent implements OnInit {
     this.registryService.create(this.registryEditorForm.value).subscribe( 
       response => {
         simple_notifier("success",null,"Saved registry");
+        this.getAllRegistries(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save registry");
@@ -113,8 +115,8 @@ export class RegistryEditorComponent implements OnInit {
     this.registryService.delete(registry).subscribe(
       (response) => {
         simple_notifier("success",null,"Deleted registry");
+        this.getAllRegistries(false);
         this.switchToTable();
-        this.refreshTable(false);
       },
       (err) => {
         simple_notifier("danger",null,"Could not delete registry");
diff --git a/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.html b/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.html
index 43aa334e8..d51a5c6a6 100644
--- a/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.html
+++ b/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.html
@@ -89,7 +89,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ researcherEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>
diff --git a/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.ts b/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.ts
index b9c96c688..c2d398cf1 100644
--- a/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.ts
+++ b/dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.ts
@@ -100,6 +100,7 @@ export class ResearcherEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved resercher");
         this.getAllResearchers(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save researcher");
diff --git a/dmp-admin/src/app/managers/service-editor/service-editor.component.html b/dmp-admin/src/app/managers/service-editor/service-editor.component.html
index 13f208ca0..9853ed965 100644
--- a/dmp-admin/src/app/managers/service-editor/service-editor.component.html
+++ b/dmp-admin/src/app/managers/service-editor/service-editor.component.html
@@ -89,7 +89,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ serviceEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>
diff --git a/dmp-admin/src/app/pipes/datarepo-table-filter.pipe.ts b/dmp-admin/src/app/pipes/datarepo-table-filter.pipe.ts
new file mode 100644
index 000000000..e60d91f27
--- /dev/null
+++ b/dmp-admin/src/app/pipes/datarepo-table-filter.pipe.ts
@@ -0,0 +1,29 @@
+import * as _ from "lodash";
+import {Pipe, PipeTransform} from "@angular/core";
+
+@Pipe({
+    name: "datarepoTableFilter"
+})
+export class DatarepoTableFilterPipe implements PipeTransform {
+
+    transform(array: any[], query: string): any {
+        
+        if (query) {
+
+            return _.filter(array, row => {
+                if (row.uri == null) row.uri = "";
+                if (row.label == null) row.label = "";
+                if (row.id == null) row.id = "";
+                return (
+                    
+                    row.label.indexOf(query) > -1 ||
+
+                    //row.version == query ||
+                    row.id.indexOf(query) > -1
+                )
+            });
+            
+        }
+        return array;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/routes.ts b/dmp-admin/src/app/routes.ts
index 9d87c9a9e..10bfb4add 100644
--- a/dmp-admin/src/app/routes.ts
+++ b/dmp-admin/src/app/routes.ts
@@ -11,6 +11,7 @@ import { ServiceEditorComponent } from './managers/service-editor/service-editor
 import { RegistryEditorComponent } from './managers/registry-editor/registry-editor.component';
 import { OrganisationEditorComponent } from './managers/organisation-editor/organisation-editor.component';
 import { ResearcherEditorComponent } from './managers/researcher-editor/researcher-editor.component';
+import { DatareposEditorComponent } from './managers/datarepos-editor/datarepos-editor.component';
 
 
 import { MainWindowComponent } from './main-window/main-window.component';
@@ -29,6 +30,10 @@ export const routes: Routes = [
     path: 'datasets', 
     component: DatasetsViewerComponent 
   },
+  { 
+    path: 'datarepos', 
+    component: DatareposEditorComponent 
+  },
   {
     path: 'datasets/profile',
     component: ProfileEditorComponent
diff --git a/dmp-admin/src/app/services/datarepo-service.ts b/dmp-admin/src/app/services/datarepo-service.ts
new file mode 100644
index 000000000..3256cc640
--- /dev/null
+++ b/dmp-admin/src/app/services/datarepo-service.ts
@@ -0,0 +1,46 @@
+import { Component, Input, OnInit, AfterViewChecked, ViewChild } from '@angular/core';
+import { HttpClient , HttpHeaders, HttpParams} from '@angular/common/http';
+import { TokenService, TokenProvider } from './login/token.service'
+import { Injectable } from '@angular/core';
+import { Toolbox } from '../services/toolbox';
+import {RestBase} from './rest-base';
+import 'rxjs/Rx';
+
+
+@Injectable()
+export class DatarepoService implements OnInit {
+
+
+  constructor(public restBase: RestBase) {
+  }
+
+  ngOnInit(){
+
+  }
+
+  getDatarepoIdsLabels() {
+    return this.restBase.get("datarepo/listAllLabelIDs");
+  }
+
+  getDatarepoIds(){
+    return this.restBase.get("datarepos");
+  }
+  
+  getAllDatarepos(){
+    return this.restBase.get("datarepo/getAll");
+  }
+
+  create(datarepo){
+    return this.restBase.post("datarepo/create", datarepo);
+  }
+
+  
+  delete(datarepoID){
+    var datarepo = {"id": datarepoID};
+    return this.restBase.post("datarepo/delete", datarepo);
+  } 
+
+
+}
+
+
diff --git a/dmp-backend/package-lock.json b/dmp-backend/package-lock.json
new file mode 100644
index 000000000..48e341a09
--- /dev/null
+++ b/dmp-backend/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 950b80032..ab1a76db7 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -53,6 +53,7 @@ export class DynamicFormComponent implements OnInit {
 
 
     this.serverService.getData().subscribe( 
+      
       response => {
 
         console.log("response");
@@ -60,6 +61,12 @@ export class DynamicFormComponent implements OnInit {
         
         const data = response;
 
+        console.log("data.dataset--BEFORE")
+        console.log(response.dataset.profile.definition)
+        console.log(response.dataset.profile.ruleset.definition)
+        console.log(response.dataset.profile.viewstyle.definition)
+
+
         //replace the xmls {model,view,rule} definitions with json -- https://github.com/abdmob/x2js library
         data.dataset.profile.definition = this.xml2jsonOBJ.xml_str2json(data.dataset.profile.definition);
         data.dataset.profile.ruleset.definition = this.xml2jsonOBJ.xml_str2json(data.dataset.profile.ruleset.definition);
@@ -67,6 +74,12 @@ export class DynamicFormComponent implements OnInit {
         //can be converted back to xml (which shouldn't be needed) with   this.xml2jsonOBJ.json2xml_str    
         
         console.log("this.serverService.getFields");
+
+        console.log("data.dataset")
+        console.log(data.dataset.profile.definition)
+        console.log(data.dataset.profile.ruleset.definition)
+        console.log(data.dataset.profile.viewstyle.definition)
+
         
         this.dataModel = new DataModel();
         this.dataModel = this.dataModelService.getDataModel(data);

From 5632b85de704f49b2173fa3454c7499f6bfd5248 Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 11:31:25 +0300
Subject: [PATCH 3/9] m e

---
 .../src/app/managers/project-editor/project-editor.component.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dmp-admin/src/app/managers/project-editor/project-editor.component.ts b/dmp-admin/src/app/managers/project-editor/project-editor.component.ts
index 8a4703332..37897da9a 100644
--- a/dmp-admin/src/app/managers/project-editor/project-editor.component.ts
+++ b/dmp-admin/src/app/managers/project-editor/project-editor.component.ts
@@ -104,6 +104,7 @@ export class ProjectEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved project");
         this.getAllProjects(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save project");

From ff2eac1bc95723bf0a88f3d649562bbb6c5e9548 Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 12:12:09 +0300
Subject: [PATCH 4/9] minor

---
 .../datasets-viewer.component.ts              | 25 ++++++++++++++++---
 .../app/services/dataset-profile.service.ts   |  6 ++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/dmp-admin/src/app/datasets-viewer/datasets-viewer.component.ts b/dmp-admin/src/app/datasets-viewer/datasets-viewer.component.ts
index 77cce589a..d64583558 100644
--- a/dmp-admin/src/app/datasets-viewer/datasets-viewer.component.ts
+++ b/dmp-admin/src/app/datasets-viewer/datasets-viewer.component.ts
@@ -112,6 +112,7 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
 
 
 
+  
   onFocusOutProfileWin($event, value:string) {
     this.nullSafeProfile();
     if(this.haveChanges){
@@ -121,7 +122,7 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
         //create profile and  a) assign it on data[] and on current profile b) assign it to dataset
         this.datasetProfileService.setDatasetProfile(this.profile).subscribe((resp) => {
           
-          /*
+          
           console.log("SERVICE RESPONSE: ");
           console.log(resp);
           console.log(resp.json());
@@ -141,13 +142,31 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
               simple_notifier("success",null,"Updated profile element");
             });
           });
-*/
+
           simple_notifier("success",null,"Updated profile element");
         });
       }
       else{
         //this.getDatasetFromDataArray()
 
+        console.log("this.profile")
+        console.log(this.profile)
+
+        console.log(this.profile)
+        this.profile.dataset = {"id": this.profile.dataset};
+
+
+        this.datasetProfileService.setDatasetProfile(this.profile).subscribe( 
+          response => {
+            simple_notifier("success",null,"Saved DMP Profile");
+            console.log(response);
+          },
+          err => {
+            simple_notifier("danger",null,"Could not save DMP Profile");
+            console.log(err);
+          }
+        );
+
       }
       
     }
@@ -365,4 +384,4 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
   }
 
 
-}
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/services/dataset-profile.service.ts b/dmp-admin/src/app/services/dataset-profile.service.ts
index 25d572be6..761b4e12d 100644
--- a/dmp-admin/src/app/services/dataset-profile.service.ts
+++ b/dmp-admin/src/app/services/dataset-profile.service.ts
@@ -19,12 +19,12 @@ export class DatasetProfileService implements OnInit {
   
 
   getDatasetProfileById(datasetProfileID){
-    return this.restBase.get("datasetprofile/"+datasetProfileID)
-        .map((response: Response) => response.json());
+    return this.restBase.get("datasetprofile/"+datasetProfileID);
+        //.map((response: Response) => response.json());
   }
 
   setDatasetProfile(datasetProfile){
-    return this.restBase.post("setDatasetProfile", datasetProfile);
+    return this.restBase.post("datasetprofile/set", datasetProfile);
   }
 
   

From 4f6d949dab85206859ab20170869a21f71f04042 Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 12:17:00 +0200
Subject: [PATCH 5/9] Update DataManagementPlanDB.sql

---
 dmp-db-scema/DataManagementPlanDB.sql | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/dmp-db-scema/DataManagementPlanDB.sql b/dmp-db-scema/DataManagementPlanDB.sql
index 9a97eae62..56fdc5e1d 100644
--- a/dmp-db-scema/DataManagementPlanDB.sql
+++ b/dmp-db-scema/DataManagementPlanDB.sql
@@ -447,12 +447,13 @@ ALTER TABLE ONLY "DatasetService"
     ADD CONSTRAINT "DatasetServiceServiceReference" FOREIGN KEY ("Service") REFERENCES "Service"("ID");
 
 
+DROP table if exists "UserDMP";
 DROP table if exists "UserInfo";
+DROP table if exists "UserAuth";
 
 CREATE TABLE "UserInfo" (
-    "autoid" uuid  DEFAULT uuid_generate_v4() NOT NULL,
-    "identification" character varying(500) NOT NULL,
-    "email" character varying(250) NOT NULL,
+    "id" uuid  DEFAULT uuid_generate_v4() UNIQUE NOT NULL,
+    "email" character varying(250) UNIQUE NOT NULL,
     "authorization_level" smallint NOT NULL,
     "usertype" smallint NOT NULL,
     "authentication" uuid,
@@ -461,15 +462,13 @@ CREATE TABLE "UserInfo" (
     "created" timestamp,
     "lastloggedin" timestamp,
     "additionalinfo" xml,
-    PRIMARY KEY (identification, email)
+    PRIMARY KEY (id)
 );
 
 COMMENT ON COLUMN "UserInfo"."authorization_level" IS 'This stores the authorization level of the user: 0 admin, 1 user, being able to be extended furthermore';
 COMMENT ON COLUMN "UserInfo"."usertype" IS 'This stores the type of user: 0 -> internal, 1 external';
 
 
-DROP table if exists "UserAuth";
-
 CREATE TABLE "UserAuth" (
     "id" uuid  DEFAULT uuid_generate_v4() NOT NULL UNIQUE,
     "username" character varying(200) NOT NULL,
@@ -483,8 +482,21 @@ ALTER TABLE "UserInfo" ADD CONSTRAINT fkey_userinfo_userauth FOREIGN KEY ("authe
 
 COMMENT ON COLUMN "UserAuth"."password" IS 'This field stores a password hash';
 
+
+create table "UserDMP" (
+   "id" uuid  DEFAULT uuid_generate_v4() NOT NULL,
+   "user" uuid NOT NULL,
+   "dmp" uuid NOT NUll,
+   "role" integer
+);
+
+ALTER TABLE "UserDMP" ADD CONSTRAINT fkey_userdmp_user FOREIGN KEY ("user") REFERENCES "UserInfo"("id");
+ALTER TABLE "UserDMP" ADD CONSTRAINT fkey_userdmp_dmp FOREIGN KEY ("dmp") REFERENCES "DMP"("ID");
+
+
 ALTER TABLE "UserInfo" OWNER TO dmptool;
 ALTER TABLE "UserAuth" OWNER TO dmptool;
+ALTER TABLE "UserDMP" OWNER TO dmptool;
 
 
 

From 59846ef8b908090bc17fec809d60c0ef339cb92f Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 12:17:56 +0200
Subject: [PATCH 6/9] Update DataManagementPlanDB.sql

---
 dmp-db-scema/DataManagementPlanDB.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dmp-db-scema/DataManagementPlanDB.sql b/dmp-db-scema/DataManagementPlanDB.sql
index 56fdc5e1d..67cd5b12a 100644
--- a/dmp-db-scema/DataManagementPlanDB.sql
+++ b/dmp-db-scema/DataManagementPlanDB.sql
@@ -25,7 +25,10 @@ drop table if exists "Registry" cascade;
 drop table if exists "DatasetService" cascade;
 drop table if exists "DatasetRegistry" cascade;
 drop table if exists "DatasetDataRepository" cascade;
-drop table if exists "UserInfo" cascade;
+DROP table if exists "UserDMP" cascade;
+DROP table if exists "UserInfo" cascade;
+DROP table if exists "UserAuth" cascade;
+
 
 
 -- CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;

From 6d4517900d633f807776ba8f61662a3ffab8a4b0 Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 13:20:04 +0300
Subject: [PATCH 7/9] Edited UserInfo

---
 .../main/java/entities/security/UserInfo.java | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/dmp-backend/src/main/java/entities/security/UserInfo.java b/dmp-backend/src/main/java/entities/security/UserInfo.java
index 23710c997..cf29d4e72 100644
--- a/dmp-backend/src/main/java/entities/security/UserInfo.java
+++ b/dmp-backend/src/main/java/entities/security/UserInfo.java
@@ -32,13 +32,10 @@ public class UserInfo implements Serializable{
 	@Id
 	@GeneratedValue
     @GenericGenerator(name = "uuid2", strategy = "uuid2")
-    @Column(name = "autoid", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
-	private UUID autoid;
+    @Column(name = "id", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
+	private UUID id;
 	
 	
-	@Column(name = "identification", nullable = false)
-	private String identification = null;
-	
 	@Column(name = "email", nullable = false)
 	private String email = null;
 	
@@ -71,12 +68,29 @@ public class UserInfo implements Serializable{
 	@Column(name = "additionalinfo", columnDefinition = "xml", nullable = true)
 	private String additionalinfo;
 
-	public String getIdentification() {
-		return identification;
+	
+	public UUID getId() {
+		return id;
 	}
 
-	public void setIdentification(String identification) {
-		this.identification = identification;
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public Date getCreated() {
+		return created;
+	}
+
+	public void setCreated(Date created) {
+		this.created = created;
+	}
+
+	public Date getLastloggedin() {
+		return lastloggedin;
+	}
+
+	public void setLastloggedin(Date lastloggedin) {
+		this.lastloggedin = lastloggedin;
 	}
 
 	public String getEmail() {

From b587a2d1512e82693f07850fde9a27731638510b Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 16:12:25 +0300
Subject: [PATCH 8/9] Changed links of proxies and of rest service

---
 .../entities/{security => }/UserInfoDao.java  |  4 +-
 .../{security => }/UserInfoDaoImpl.java       |  4 +-
 dmp-backend/src/main/java/entities/DMP.java   | 17 +++++
 .../src/main/java/entities/UserDMP.java       | 76 +++++++++++++++++++
 .../entities/{security => }/UserInfo.java     | 17 ++++-
 dmp-backend/src/main/java/login/Login.java    |  4 +-
 .../src/main/java/{rest => }/proxy/Proxy.java |  8 +-
 .../src/main/java/rest/entities/Datasets.java |  1 +
 .../src/main/java/rest/entities/Projects.java |  1 +
 .../CustomAuthenticationProvider.java         |  5 +-
 .../validators/GoogleTokenValidator.java      |  2 +-
 .../webapp/WEB-INF/applicationContext.xml     |  4 +-
 .../WEB-INF/dmp-backend-login-servlet.xml     |  2 +-
 .../WEB-INF/dmp-backend-proxy-servlet.xml     | 44 +++++++++++
 .../WEB-INF/dmp-backend-rest-servlet.xml      |  4 +-
 dmp-backend/src/main/webapp/WEB-INF/web.xml   | 15 +++-
 16 files changed, 185 insertions(+), 23 deletions(-)
 rename dmp-backend/src/main/java/dao/entities/{security => }/UserInfoDao.java (78%)
 rename dmp-backend/src/main/java/dao/entities/{security => }/UserInfoDaoImpl.java (95%)
 create mode 100644 dmp-backend/src/main/java/entities/UserDMP.java
 rename dmp-backend/src/main/java/entities/{security => }/UserInfo.java (87%)
 rename dmp-backend/src/main/java/{rest => }/proxy/Proxy.java (95%)
 create mode 100644 dmp-backend/src/main/webapp/WEB-INF/dmp-backend-proxy-servlet.xml

diff --git a/dmp-backend/src/main/java/dao/entities/security/UserInfoDao.java b/dmp-backend/src/main/java/dao/entities/UserInfoDao.java
similarity index 78%
rename from dmp-backend/src/main/java/dao/entities/security/UserInfoDao.java
rename to dmp-backend/src/main/java/dao/entities/UserInfoDao.java
index 63a17532c..cd4bf85c4 100644
--- a/dmp-backend/src/main/java/dao/entities/security/UserInfoDao.java
+++ b/dmp-backend/src/main/java/dao/entities/UserInfoDao.java
@@ -1,9 +1,9 @@
-package dao.entities.security;
+package dao.entities;
 
 import java.util.UUID;
 
 import dao.Dao;
-import entities.security.UserInfo;
+import entities.UserInfo;
 
 public interface UserInfoDao extends Dao<UserInfo, UUID> {
 
diff --git a/dmp-backend/src/main/java/dao/entities/security/UserInfoDaoImpl.java b/dmp-backend/src/main/java/dao/entities/UserInfoDaoImpl.java
similarity index 95%
rename from dmp-backend/src/main/java/dao/entities/security/UserInfoDaoImpl.java
rename to dmp-backend/src/main/java/dao/entities/UserInfoDaoImpl.java
index d6d806e60..4905d0caf 100644
--- a/dmp-backend/src/main/java/dao/entities/security/UserInfoDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/UserInfoDaoImpl.java
@@ -1,4 +1,4 @@
-package dao.entities.security;
+package dao.entities;
 
 import java.util.List;
 import java.util.UUID;
@@ -7,8 +7,8 @@ import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 
 import dao.JpaDao;
+import entities.UserInfo;
 import entities.security.UserAuth;
-import entities.security.UserInfo;
 
 
 public class UserInfoDaoImpl extends JpaDao<UserInfo, UUID> implements UserInfoDao {
diff --git a/dmp-backend/src/main/java/entities/DMP.java b/dmp-backend/src/main/java/entities/DMP.java
index f418e123b..e98764226 100644
--- a/dmp-backend/src/main/java/entities/DMP.java
+++ b/dmp-backend/src/main/java/entities/DMP.java
@@ -88,6 +88,14 @@ public class DMP implements Serializable {
     private Set<Researcher> researchers;
 	
 	
+//	@OneToMany(fetch = FetchType.EAGER)
+//    @JoinTable(name="\"UserDMP\"",
+//    		joinColumns={@JoinColumn(name="dmp", referencedColumnName="\"ID\"")},
+//    	    inverseJoinColumns={@JoinColumn(name="user", referencedColumnName="\"ID\"")}
+//    )
+//    private Set<UserInfo> users;
+	
+	
 	public UUID getId() {
 		return id;
 	}
@@ -168,6 +176,15 @@ public class DMP implements Serializable {
 		this.researchers = researchers;
 	}
 	
+
+//	public Set<UserInfo> getUsers() {
+//		return users;
+//	}
+//
+//	public void setUsers(Set<UserInfo> users) {
+//		this.users = users;
+//	}
+
 	public String toString() {
 		try {
 			return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).writeValueAsString(this);
diff --git a/dmp-backend/src/main/java/entities/UserDMP.java b/dmp-backend/src/main/java/entities/UserDMP.java
new file mode 100644
index 000000000..f200e0ddd
--- /dev/null
+++ b/dmp-backend/src/main/java/entities/UserDMP.java
@@ -0,0 +1,76 @@
+//package entities;
+//
+//import java.io.Serializable;
+//import java.util.UUID;
+//
+//import javax.persistence.Column;
+//import javax.persistence.Entity;
+//import javax.persistence.GeneratedValue;
+//import javax.persistence.Id;
+//import javax.persistence.Table;
+//
+//import org.hibernate.annotations.GenericGenerator;
+//import org.hibernate.annotations.Type;
+//
+//import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+//import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+//
+//@Entity
+//@Table(name="\"UserInfo\"")
+//@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="autoid")
+//public class UserDMP implements Serializable{
+//
+//	private static final long serialVersionUID = -4467370784003784660L;
+//
+//	
+//	@Id
+//	@GeneratedValue
+//    @GenericGenerator(name = "uuid2", strategy = "uuid2")
+//    @Column(name = "id", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
+//	private UUID id;
+//	
+//	@Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL
+//	@Column(name = "user", nullable = false)
+//	private UUID user;
+//    
+//	@Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL
+//	@Column(name = "dmp", nullable = false)
+//	private UUID dmp;
+//
+//	@Column(name = "role")
+//	private Integer role;
+//
+//	public UUID getId() {
+//		return id;
+//	}
+//
+//	public void setId(UUID id) {
+//		this.id = id;
+//	}
+//
+//	public UUID getUser() {
+//		return user;
+//	}
+//
+//	public void setUser(UUID user) {
+//		this.user = user;
+//	}
+//
+//	public UUID getDmp() {
+//		return dmp;
+//	}
+//
+//	public void setDmp(UUID dmp) {
+//		this.dmp = dmp;
+//	}
+//
+//	public Integer getRole() {
+//		return role;
+//	}
+//
+//	public void setRole(Integer role) {
+//		this.role = role;
+//	}
+//	
+//	
+//}
diff --git a/dmp-backend/src/main/java/entities/security/UserInfo.java b/dmp-backend/src/main/java/entities/UserInfo.java
similarity index 87%
rename from dmp-backend/src/main/java/entities/security/UserInfo.java
rename to dmp-backend/src/main/java/entities/UserInfo.java
index cf29d4e72..df718fef8 100644
--- a/dmp-backend/src/main/java/entities/security/UserInfo.java
+++ b/dmp-backend/src/main/java/entities/UserInfo.java
@@ -1,7 +1,8 @@
-package entities.security;
+package entities;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
 import java.util.UUID;
 
 import javax.persistence.Column;
@@ -10,6 +11,8 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
@@ -21,10 +24,12 @@ import org.hibernate.annotations.Type;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
+import entities.security.UserAuth;
+
 
 @Entity
 @Table(name="\"UserInfo\"")
-@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="autoid")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
 public class UserInfo implements Serializable{
 
 	private static final long serialVersionUID = 1225151430484658395L;
@@ -68,6 +73,14 @@ public class UserInfo implements Serializable{
 	@Column(name = "additionalinfo", columnDefinition = "xml", nullable = true)
 	private String additionalinfo;
 
+//	@OneToMany(fetch = FetchType.EAGER)
+//    @JoinTable(name="\"UserDMP\"", 
+//    		joinColumns={@JoinColumn(name="user", referencedColumnName="\"ID\"")},
+//    	    inverseJoinColumns={@JoinColumn(name="dmp", referencedColumnName="\"ID\"")}
+//    )  
+//    private Set<UserInfo> users;
+	
+	
 	
 	public UUID getId() {
 		return id;
diff --git a/dmp-backend/src/main/java/login/Login.java b/dmp-backend/src/main/java/login/Login.java
index 83396c21a..617a890a3 100644
--- a/dmp-backend/src/main/java/login/Login.java
+++ b/dmp-backend/src/main/java/login/Login.java
@@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import dao.entities.UserInfoDao;
 import dao.entities.security.UserAuthDao;
-import dao.entities.security.UserInfoDao;
+import entities.UserInfo;
 import entities.security.UserAuth;
-import entities.security.UserInfo;
 import security.TokenSessionManager;
 
 
diff --git a/dmp-backend/src/main/java/rest/proxy/Proxy.java b/dmp-backend/src/main/java/proxy/Proxy.java
similarity index 95%
rename from dmp-backend/src/main/java/rest/proxy/Proxy.java
rename to dmp-backend/src/main/java/proxy/Proxy.java
index 4678ee955..a4cffe510 100644
--- a/dmp-backend/src/main/java/rest/proxy/Proxy.java
+++ b/dmp-backend/src/main/java/proxy/Proxy.java
@@ -1,4 +1,4 @@
-package rest.proxy;
+package proxy;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -57,12 +57,12 @@ public class Proxy {
 				while ((inputLine = in.readLine()) != null)
 					response.append(inputLine);
 				in.close();
-			} else {
+				return ResponseEntity.status(HttpStatus.OK).body(response.toString());
+			} 
+			else {
 				return ResponseEntity.status(HttpStatus.FORBIDDEN).body("{'reason': 'Remote server responded with: "+responseCode+"'}");
 			}
 			
-			return ResponseEntity.status(HttpStatus.OK).body(response.toString());
-			
 		} catch (IOException | URISyntaxException e) {
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{'reason': 'Could not proxy to given host'}");
 		}
diff --git a/dmp-backend/src/main/java/rest/entities/Datasets.java b/dmp-backend/src/main/java/rest/entities/Datasets.java
index 487c29711..2cad4479b 100644
--- a/dmp-backend/src/main/java/rest/entities/Datasets.java
+++ b/dmp-backend/src/main/java/rest/entities/Datasets.java
@@ -257,6 +257,7 @@ public class Datasets  {
 		try {
 			return ResponseEntity.status(HttpStatus.CREATED).body(objectMapper.writeValueAsString(createdDatasetProfile));
 		} catch (JsonProcessingException e) {
+			e.printStackTrace();
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not set dataset profile!\"}");
 		}
 		
diff --git a/dmp-backend/src/main/java/rest/entities/Projects.java b/dmp-backend/src/main/java/rest/entities/Projects.java
index f9fdf63d1..5c806d605 100644
--- a/dmp-backend/src/main/java/rest/entities/Projects.java
+++ b/dmp-backend/src/main/java/rest/entities/Projects.java
@@ -132,6 +132,7 @@ public class Projects  {
 	}
 	
 	
+	
 	@Transactional
 	@RequestMapping(method = RequestMethod.POST, value = { "/project/create" }, consumes = "application/json", produces="application/json")
 	public @ResponseBody ResponseEntity<Object> setProject(@RequestBody Project project) {
diff --git a/dmp-backend/src/main/java/security/CustomAuthenticationProvider.java b/dmp-backend/src/main/java/security/CustomAuthenticationProvider.java
index 71b458f81..4094e9c7b 100644
--- a/dmp-backend/src/main/java/security/CustomAuthenticationProvider.java
+++ b/dmp-backend/src/main/java/security/CustomAuthenticationProvider.java
@@ -12,8 +12,8 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.stereotype.Component;
 
-import dao.entities.security.UserInfoDao;
-import entities.security.UserInfo;
+import dao.entities.UserInfoDao;
+import entities.UserInfo;
 import exceptions.NonValidTokenException;
 import security.validators.GoogleTokenValidator;
 import security.validators.NativeTokenValidator;
@@ -64,7 +64,6 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
 		else
 			throw new AuthenticationServiceException("Authentication failed");
 		
-		
 	}
 
 	@Override
diff --git a/dmp-backend/src/main/java/security/validators/GoogleTokenValidator.java b/dmp-backend/src/main/java/security/validators/GoogleTokenValidator.java
index cc381c298..a6f07646a 100644
--- a/dmp-backend/src/main/java/security/validators/GoogleTokenValidator.java
+++ b/dmp-backend/src/main/java/security/validators/GoogleTokenValidator.java
@@ -12,7 +12,7 @@ import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.jackson2.JacksonFactory;
 
-import entities.security.UserInfo;
+import entities.UserInfo;
 import exceptions.NonValidTokenException;
 
 public class GoogleTokenValidator implements TokenValidator {
diff --git a/dmp-backend/src/main/webapp/WEB-INF/applicationContext.xml b/dmp-backend/src/main/webapp/WEB-INF/applicationContext.xml
index eda1d3d0e..5b2d0c977 100644
--- a/dmp-backend/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/dmp-backend/src/main/webapp/WEB-INF/applicationContext.xml
@@ -31,7 +31,7 @@
 	<bean id="nativeTokenValidator" class="security.validators.NativeTokenValidator" />
 	
 	
-	<bean id="proxy" class="rest.proxy.Proxy">
+	<bean id="proxy" class="proxy.Proxy">
 		<constructor-arg type = "String" value = "${proxy.allowed.host}"/>
 	</bean>
 	
@@ -100,7 +100,7 @@
 	<bean id="registryDao" class="dao.entities.RegistryDaoImpl" />
 	<bean id="researcherDao" class="dao.entities.ResearcherDaoImpl" />
 	<bean id="serviceDao" class="dao.entities.ServiceDaoImpl" />
-	<bean id="userInfoDao" class="dao.entities.security.UserInfoDaoImpl" />
+	<bean id="userInfoDao" class="dao.entities.UserInfoDaoImpl" />
 	<bean id="userAuthDao" class="dao.entities.security.UserAuthDaoImpl" />
 
 
diff --git a/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-login-servlet.xml b/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-login-servlet.xml
index 4d2127185..b09d16973 100644
--- a/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-login-servlet.xml
+++ b/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-login-servlet.xml
@@ -10,7 +10,7 @@
  						http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
 	
 	
-<!-- 	<context:property-placeholder location="classpath*:**/dmp.properties" /> -->
+	<context:property-placeholder location="classpath*:**/dmp.properties" />
 	
 	<mvc:resources mapping="resources/**" location="/resources/" />
 	<mvc:annotation-driven />
diff --git a/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-proxy-servlet.xml b/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-proxy-servlet.xml
new file mode 100644
index 000000000..a24cbb4af
--- /dev/null
+++ b/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-proxy-servlet.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc
+ 						http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
+ 						http://www.springframework.org/schema/context
+ 						http://www.springframework.org/schema/context/spring-context-4.1.xsd
+ 						http://www.springframework.org/schema/beans
+ 						http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+	
+	
+	<context:property-placeholder location="classpath*:**/dmp.properties" />
+	
+	<mvc:resources mapping="resources/**" location="/resources/" />
+	<mvc:annotation-driven />
+	<context:component-scan base-package="proxy" />
+
+
+	<bean id="proxy" class="proxy.Proxy">
+		<constructor-arg type = "String" value = "${proxy.allowed.host}"/>
+	</bean>
+
+	<bean id="multipartResolver"
+		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+		<property name="maxUploadSize" value="100000000" />
+	</bean>
+
+	<bean id="jsonConverter"
+		class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+		<property name="prefixJson" value="false" />
+		<property name="supportedMediaTypes" value="application/json" />
+	</bean>
+
+	<bean
+		class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+		<property name="messageConverters">
+			<list>
+				<ref bean="jsonConverter" />
+			</list>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-rest-servlet.xml b/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-rest-servlet.xml
index 1b2b28672..5bce8017b 100644
--- a/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-rest-servlet.xml
+++ b/dmp-backend/src/main/webapp/WEB-INF/dmp-backend-rest-servlet.xml
@@ -16,9 +16,7 @@
 	<mvc:annotation-driven />
 	<context:component-scan base-package="rest" />
 	
-	<bean id="proxy" class="rest.proxy.Proxy">
-		<constructor-arg type = "String" value = "${proxy.allowed.host}"/>
-	</bean>
+
 	
 	<bean
 		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
diff --git a/dmp-backend/src/main/webapp/WEB-INF/web.xml b/dmp-backend/src/main/webapp/WEB-INF/web.xml
index 00096c71c..13fdb5e4c 100644
--- a/dmp-backend/src/main/webapp/WEB-INF/web.xml
+++ b/dmp-backend/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,20 @@
   
   <display-name>dmp-backend</display-name>
   
-    
+  <servlet>
+    <servlet-name>dmp-backend-proxy</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>dmp-backend-proxy</servlet-name>
+    <url-pattern>/proxy/*</url-pattern>
+  </servlet-mapping>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  
+  
   <servlet>
     <servlet-name>dmp-backend-login</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>

From 7092e919186c297bc2b58b751121c96d87ce51fc Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 18 Oct 2017 16:20:21 +0300
Subject: [PATCH 9/9] Added the connector to the external service provider

---
 dmp-frontend/src/app/app.module.ts            |  4 +-
 .../src/app/services/eestore.service.ts       | 61 ++++++++++++++++
 dmp-frontend/src/app/services/rest-base.ts    | 69 +++++++++++++++++++
 .../src/app/services/token.service.ts         |  8 +--
 4 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 dmp-frontend/src/app/services/eestore.service.ts
 create mode 100644 dmp-frontend/src/app/services/rest-base.ts

diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts
index b1d9312ff..a96ab1003 100644
--- a/dmp-frontend/src/app/app.module.ts
+++ b/dmp-frontend/src/app/app.module.ts
@@ -6,6 +6,7 @@ import { HttpModule } from '@angular/http';
 import { RouterModule, Routes, Router } from '@angular/router';
 
 import { AppComponent } from './app.component';
+import { RestBase } from './services/rest-base';
 import { DynamicFormComponent } from './form/dynamic-form.component';
 import { DynamicFormFieldComponent } from './form/fields/dynamic-form-field.component';
 import { ServerService } from './services/server.service';
@@ -21,6 +22,7 @@ import { PageNotFoundComponent }   from './not-found.component';
 import { TocComponent } from './form/tableOfContents/toc.component';
 import { ProjectsModule } from './projects/project.module';
 import { PaginationService } from './services/pagination.service';
+import { EestoreService } from './services/eestore.service';
 
 @NgModule({
   declarations: [
@@ -43,7 +45,7 @@ import { PaginationService } from './services/pagination.service';
     AppRoutingModule
     
   ],
-  providers: [ServerService, dataModelBuilder, AuthGuard, PaginationService, TokenService, LocalStorageService],
+  providers: [ServerService, dataModelBuilder, AuthGuard, PaginationService, TokenService, LocalStorageService, RestBase, EestoreService],
   bootstrap: [AppComponent]
 })
 export class AppModule {
diff --git a/dmp-frontend/src/app/services/eestore.service.ts b/dmp-frontend/src/app/services/eestore.service.ts
new file mode 100644
index 000000000..904b8080c
--- /dev/null
+++ b/dmp-frontend/src/app/services/eestore.service.ts
@@ -0,0 +1,61 @@
+import { Component, Input, OnInit, AfterViewChecked, ViewChild, Injectable } from '@angular/core';
+
+import {RestBase} from './rest-base';
+
+
+@Injectable()
+export class EestoreService implements OnInit {
+
+  base: string = "https://eestore.paas2.uninett.no/api/";
+
+  datarepo: string =  this.base+"datarepo/";
+  projectrepo: string =   this.base+"projectrepo/";
+  organizationrepo: string = this.base+"organizationrepo/";
+  metadataschemarepo: string = this.base+"metadataschemarepo/";
+  servicerepo: string = this.base+"servicerepo/";
+  personrepo: string = this.base+"personrepo/";
+  config: string = this.base+"config/";
+  configtags: string = this.base+"configtags/";
+  
+
+  constructor(public restBase: RestBase) {
+  }
+
+  ngOnInit(){
+    
+  }
+
+
+  getDataRepos(){
+   return this.restBase.proxy_get(this.datarepo);
+  }
+
+  getProjectRepos(){
+    return this.restBase.proxy_get(this.projectrepo);
+  }
+
+  getOrganizationRepos(){
+    return this.restBase.proxy_get(this.organizationrepo);
+  }
+
+  getMetadataSchemaRepos(){
+    return this.restBase.proxy_get(this.metadataschemarepo);
+  }
+
+  getServiceRepos(){
+    return this.restBase.proxy_get(this.servicerepo);
+  }
+
+  getPersonRepos(){
+    return this.restBase.proxy_get(this.personrepo);
+  }
+
+  getConfigs(){
+    return this.restBase.proxy_get(this.config);
+  }
+
+  getConfigTags(){
+    return this.restBase.proxy_get(this.configtags);
+  }
+
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/services/rest-base.ts b/dmp-frontend/src/app/services/rest-base.ts
new file mode 100644
index 000000000..12efb01f4
--- /dev/null
+++ b/dmp-frontend/src/app/services/rest-base.ts
@@ -0,0 +1,69 @@
+import { HttpClient , HttpHeaders, HttpParams } from '@angular/common/http';
+import { TokenService, TokenProvider } from './token.service'
+import 'rxjs/Rx';
+
+
+declare var X2JS: any;
+
+export class RestBase {
+
+    xml2jsonOBJ: any;
+
+    static get parameters() { return [HttpClient, TokenService] }
+
+    constructor(public http : HttpClient, public tokenService : TokenService) {
+        this.xml2jsonOBJ = new X2JS();
+    }
+    
+    protocol: string = "http";
+    hostname: string = "localhost";//"dl010.madgik.di.uoa.gr";//
+    port: number = 7070;//8080;//
+    webappname: string = "dmp-backend";//"dmp-backend-new";//
+
+
+    proxyPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/proxy/";
+    loginPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/login/";
+    restPath: string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/rest/";
+
+
+    public proxy_get(path : string){
+        var options = this.createOptions();
+        return this.http.get<any>(this.proxyPath +"proxy?url="+ path, options);
+    }
+
+    public login(path : string, data : any){
+        let options = { headers: new HttpHeaders().set('Content-Type', 'application/json') };
+        return this.http.post<any>(this.loginPath + path, JSON.stringify(data), options);
+    }
+
+    public get(path : string){
+        var options = this.createOptions();
+        return this.http.get<any>(this.restPath + path, options);
+    }
+
+
+    public post(path : string, data : any) {
+        var options = this.createOptions();
+        return this.http.post<any>(this.restPath + path, JSON.stringify(data), options);
+    }
+
+
+    private createOptions(){
+        var token = this.tokenService.getToken();
+        var provider: TokenProvider = this.tokenService.getProvider();
+        //var csrfToken : string = this.tokenService.getCSRFToken();
+
+        const params = new HttpParams();
+        var headers;
+        if(provider == TokenProvider.google)
+            headers =  new HttpHeaders().set('Content-Type', 'application/json').set("google-token", token);
+        if(provider == TokenProvider.native)
+            headers =  new HttpHeaders().set('Content-Type', 'application/json').set("native-token", token);
+        let options = { params: params, headers: headers };
+        return options;
+    }
+    
+    
+    
+}
+    
\ No newline at end of file
diff --git a/dmp-frontend/src/app/services/token.service.ts b/dmp-frontend/src/app/services/token.service.ts
index 5b2bd7897..0521179f6 100644
--- a/dmp-frontend/src/app/services/token.service.ts
+++ b/dmp-frontend/src/app/services/token.service.ts
@@ -11,11 +11,11 @@ export class TokenService {
 
 
   constructor (private storage : LocalStorageService, @Inject(DOCUMENT) private document) {
-    var csrfToken : string = jQuery(document).find('meta[name="csrf-token"]').attr('content');
-    this.setCSRFToken(csrfToken);
+    //var csrfToken : string = jQuery(document).find('meta[name="csrf-token"]').attr('content');
+    //this.setCSRFToken(csrfToken);
   }
   
-  
+  /*
   getCSRFToken() : string{
     return this.storage.retrieve('csrf-token');
   }
@@ -23,7 +23,7 @@ export class TokenService {
   setCSRFToken(csrfToken : string){
     this.storage.store('csrf-token',csrfToken);
   }
-
+*/
 
   getProvider() : TokenProvider {
     return this.storage.retrieve('provider');