[MSO-8] Additional fixes for the second rebase

DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file
not reloaded properly when it's wrong (JSON error or model hierarchy
mistake) at MSO startup

Change-Id: I2853030b78499e2a761706b643ea210955e72de3
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

[MSO-8] Restore files removed in patch set 2

Those groovy files must be there

Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

1 files changed, 23 insertions, 0 deletions

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceInstanceData.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceInstanceData.java
new file mode 100644
index 0000000..9b7393d
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceInstanceData.java
@@ -0,0 +1,23 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.Serializable;

+

+public class ServiceInstanceData extends JsonWrapper implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+	private String instanceId;

+	private String instanceName;

+	

+	public String getInstanceId() {

+		return instanceId;

+	}

+	public void setInstanceId(String instanceId) {

+		this.instanceId = instanceId;

+	}

+	public String getInstanceName() {

+		return instanceName;

+	}

+	public void setInstanceName(String instanceName) {

+		this.instanceName = instanceName;

+	}

+}