From 060290aae5deb33884e5b0921e4eaa21404b4406 Mon Sep 17 00:00:00 2001 From: phantomjinx Date: Thu, 29 Mar 2018 16:31:48 +0100 Subject: [PATCH] Updates the associated connection of komodo model source * Due to change in naming of associated connection to origin connection in komodo's model source, update references accordingly. --- .../app/dataservices/shared/vdb-model-source.model.ts | 10 +++++----- ngapp/src/app/dataservices/shared/vdb.service.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngapp/src/app/dataservices/shared/vdb-model-source.model.ts b/ngapp/src/app/dataservices/shared/vdb-model-source.model.ts index 6d9594ef..35b11fc7 100644 --- a/ngapp/src/app/dataservices/shared/vdb-model-source.model.ts +++ b/ngapp/src/app/dataservices/shared/vdb-model-source.model.ts @@ -25,7 +25,7 @@ export class VdbModelSource { private keng__kType = "VdbModelSource"; private vdb__sourceJndiName: string; private vdb__sourceTranslator: string; - private tko__associatedConnection: string; + private vdb__originConnection: string; /** * @param {Object} json the JSON representation of a VdbModelSource @@ -79,8 +79,8 @@ export class VdbModelSource { /** * @returns {string} the associated connection path (can be null) */ - public getAssociatedConnection(): string { - return this.tko__associatedConnection; + public getOriginConnection(): string { + return this.vdb__originConnection; } /** @@ -114,8 +114,8 @@ export class VdbModelSource { /** * @param {string} connectionPath the path to the associated connection (optional) */ - public setAssociatedConnection( connectionPath?: string ): void { - this.tko__associatedConnection = connectionPath ? connectionPath : null; + public setOriginConnection( connectionPath?: string ): void { + this.vdb__originConnection = connectionPath ? connectionPath : null; } /** diff --git a/ngapp/src/app/dataservices/shared/vdb.service.ts b/ngapp/src/app/dataservices/shared/vdb.service.ts index 277f4aa4..e31f05c8 100644 --- a/ngapp/src/app/dataservices/shared/vdb.service.ts +++ b/ngapp/src/app/dataservices/shared/vdb.service.ts @@ -377,7 +377,7 @@ export class VdbService extends ApiService { vdbModelSource.setDataPath(vdbPath + "/" + vdbModelName + "/vdb:sources/" + vdbModelSourceName); vdbModelSource.setJndiName(connection.getJndiName()); vdbModelSource.setTranslatorName(connection.getDriverName()); - vdbModelSource.setAssociatedConnection(connection.getDataPath()); + vdbModelSource.setOriginConnection(connection.getDataPath()); // Chain the individual calls together in series to build the Vdb and deploy it return this.deleteVdbIfFound(vdb.getId())