42 files changed, 94 insertions, 14 deletions
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts
index 1f8526a53..09fa00315 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts
@@ -105,6 +105,7 @@ export class EditorComponent implements OnInit {
   private fileObject: any;
   private tocsaMetadaData: any;
   metadata: IMetaData;
+  uploadedFileName: string;
 
   private transformer = (node: Node, level: number) => {
     return {
@@ -159,6 +160,7 @@ export class EditorComponent implements OnInit {
         this.filesData = blueprintdata.filesData;
         this.dataSource.data = this.filesTree;
         this.blueprintName = blueprintdata.name;
+        this.uploadedFileName = blueprintdata.uploadedFileName;
         let blueprint = [];
         for (let key in this.blueprintdata) {
           if (this.blueprintdata.hasOwnProperty(key)) {
@@ -176,6 +178,7 @@ export class EditorComponent implements OnInit {
         this.artifactVersion = metadatavalues[4];
         this.editor.getEditor().getSession().setTabSize(2);
         this.editor.getEditor().getSession().setUseWrapMode(true);
+        this.editor.getEditor().getSession().setValue("");
         this.setEditorMode();
       })
   }
@@ -201,7 +204,8 @@ export class EditorComponent implements OnInit {
       blueprint: this.blueprint,
       name: this.blueprintName,
       files: this.filesTree,
-      filesData: this.filesData
+      filesData: this.filesData,
+      uploadedFileName: this.uploadedFileName
     }
     this.store.dispatch(new SetBlueprintState(blueprintState));
     // console.log(this.text);
@@ -217,7 +221,7 @@ export class EditorComponent implements OnInit {
     this.filetoDelete = file.name;
     this.currentFilePath = this.currentFilePath + this.selectedFile;
     this.filesData.forEach((fileNode) => {
-      if (fileNode.name.includes(file.name)) {
+      if (fileNode.name.includes(file.name) && fileNode.name == this.currentFilePath) {
         this.text = fileNode.data;
       }
     })
@@ -405,7 +409,9 @@ export class EditorComponent implements OnInit {
     this.paths = [];
     for (var file in zip.files) {
       this.fileObject = {
-        name: zip.files[file].name,
+        // name: zip.files[file].name,
+        // name: this.uploadedFileName + '/' + zip.files[file].name,
+        name: this.uploadedFileName + zip.files[file].name,
         data: ''
       };
       const value = <any>await zip.files[file].async('string');
@@ -425,6 +431,7 @@ export class EditorComponent implements OnInit {
 
     if (this.validfile) {
       this.fetchTOSACAMetadata();
+      this.filesData = this.paths;
       this.tree = this.arrangeTreeData(this.paths);
     } else {
       alert('Please update proper file with TOSCA metadata');
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts
index 63c8019c3..ec2524422 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts
@@ -24,7 +24,6 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, observable } from 'rxjs';
 import { ApiService } from '../../../../common/core/services/api.service';
-import { LoopbackConfig } from '../../../../common/constants/app-constants';
 import { saveAs } from 'file-saver';
 
 @Injectable()
@@ -35,10 +34,10 @@ export class EditorService {
     }
 
     enrich(uri: string, body: FormData): Observable<any> {
-        return this.api.post(LoopbackConfig.url + uri, body, { responseType: 'blob' });
+        return this.api.post(uri, body, { responseType: 'blob' });
     }
     downloadCBA(uri: string): string {
-        this.api.get(LoopbackConfig.url + uri, { responseType: 'blob' })
+        this.api.get(uri, { responseType: 'blob' })
             .subscribe(response => {
                 let blob = new Blob([response], { 'type': "application/octet-stream" });
                 saveAs(blob, "CBA.zip");
@@ -49,11 +48,11 @@ export class EditorService {
     }
     post(uri: string, body: any | null, options?: any): Observable<any> {
 
-        return this.api.post(LoopbackConfig.url + uri, body, options);
+        return this.api.post(uri, body, options);
     }
 
     deployPost(uri: string, body: any | null, options?: any): Observable<any> {
 
-        return this.api.post(LoopbackConfig.url + uri, body, { responseType: 'text' });
+        return this.api.post(uri, body, { responseType: 'text' });
     }
 }
 \ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts
index 9c11f7684..1d0ba2c39 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts
@@ -78,7 +78,8 @@ export class SearchTemplateComponent implements OnInit {
       blueprint: data,
       name: this.blueprintName,
       files: this.tree,
-      filesData: this.paths
+      filesData: this.paths,
+      uploadedFileName: this.uploadedFileName
     }
     this.store.dispatch(new SetBlueprintState(blueprintState))
     // this.store.dispatch(new LoadBlueprintSuccess(data));
@@ -87,7 +88,9 @@ export class SearchTemplateComponent implements OnInit {
   async buildFileViewData(zip) {
     this.validfile = false;
     this.paths = [];
+    console.log(zip.files);
     for (var file in zip.files) {
+      console.log("name: " +zip.files[file].name);
       this.fileObject = {
         // nameForUIDisplay: this.uploadedFileName + '/' + zip.files[file].name,
         // name: zip.files[file].name,
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts
index 8df8e78a6..3896265fe 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts
@@ -24,7 +24,6 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, observable } from 'rxjs';
 import { ApiService } from '../../../common/core/services/api.service';
-import { LoopbackConfig } from '../../../common/constants/app-constants';
 
 @Injectable()
 export class TestTemplateService {
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts
index 7c3bf5465..a4177c176 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts
@@ -24,7 +24,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, observable } from 'rxjs';
 import { ApiService } from  '../../../../common/core/services/api.service';
-import { LoopbackConfig, ResourceDictionaryURLs } from '../../../../common/constants/app-constants';
+import { ResourceDictionaryURLs } from '../../../../common/constants/app-constants';
 
 @Injectable()
 export class ExsistingModelService {
@@ -34,6 +34,6 @@ export class ExsistingModelService {
     }
 
     searchByTags(tag) {
-       return this.api.get(LoopbackConfig.url+ ResourceDictionaryURLs.searchResourceDictionaryByTags + '/' + tag);
+       return this.api.get(ResourceDictionaryURLs.searchResourceDictionaryByTags + '/' + tag);
     }
 }
 \ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.spec.ts
index 9051a86fa..6d4b81823 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+* 
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.ts
index b81a7335e..7ef40920b 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/search-resource/search-resource.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html
index afb2b9d55..548128d4a 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.scss
index 50a386aa4..c36bc2f42 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.spec.ts
index 77d9c6819..bb64c6aed 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.ts
index 549fbb7ea..65c285e33 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.html
index a0e6b15c3..b33978d13 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.scss
index 2205ac8e7..946165a9a 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.spec.ts
index 2061ed27c..8a7a10b65 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.ts
index 1c6efc9c8..ec7767576 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-template-options/resource-template-options.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource-routing.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource-routing.module.ts
index 73e6459a5..c3f00b827 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource-routing.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource-routing.module.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html
index 3d60dabb8..2b79dd44d 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.scss
index cafd2bf8f..cd9725f83 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.spec.ts
index 9893230ed..18d607310 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.ts
index ac3561a21..5299a08e5 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.module.ts
index 3f27c2db2..5be0bfce9 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/upload-resource/upload-resource.module.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
index 2f0b3fe30..5007a1548 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
index 60a8b94ec..826e3142a 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss
index 328adcf71..f8f2af13a 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.spec.ts
index 72d72dd02..fd34b1618 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.ts
index c2f3dad7f..f7f938831 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts
index 0e056530d..971e12c9e 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit-routing.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit-routing.module.ts
index ae417c454..494e765b2 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit-routing.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit-routing.module.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 * =================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.html
index 4bd4ad456..5be2a1457 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.scss
index 9c2d42a83..236aa97ce 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.spec.ts
index f88452d31..af2adc077 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.ts
index 77e901717..4603c529f 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts
index ae7143cfb..8d2c9aabb 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts
index 982d71d58..bd06abbc1 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts
@@ -24,7 +24,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, observable } from 'rxjs';
 import { ApiService } from  '../../../common/core/services/api.service';
-import { LoopbackConfig, ResourceDictionaryURLs } from '../../../common/constants/app-constants';
+import { ResourceDictionaryURLs } from '../../../common/constants/app-constants';
 
 @Injectable()
 export class ResourceEditService {
@@ -34,6 +34,6 @@ export class ResourceEditService {
     }
 
     saveResource(resource) {
-       return this.api.post(LoopbackConfig.url+ ResourceDictionaryURLs.saveResourceDictionary, resource);
+       return this.api.post(ResourceDictionaryURLs.saveResourceDictionary, resource);
     }
 }
 \ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html
index 3b35a9929..d40dbd957 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.scss
index aa8ca61b5..833376c33 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.spec.ts
index f157ca58f..55be36e2a 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts
index 29244f0fb..6762f7c26 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.html
index 91a22b8b4..b1474d2a2 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.html
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.scss
index 5bec796e8..d4cb7ddfd 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.scss
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.spec.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.spec.ts
index 4a94fed93..cdebf8d32 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.spec.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.spec.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.ts
index 517add87b..52b19f728 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.ts
@@ -3,6 +3,8 @@
 * ONAP : CDS
 * ================================================================================
 * Copyright (C) 2019 TechMahindra
+*
+* Modifications Copyright (C) 2019 IBM
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.