[sdc] update to the current code base

and support http

Change-Id: I2fb35494b40126a8395b1e309a180db4127754b7
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
index 56e26ce55e..1bef188d0d 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
@@ -64,6 +64,8 @@ public class DistributionEngineConfiguration extends BasicConfiguration {
 
 	private Integer defaultArtifactInstallationTimeout = 60;
 
+	private boolean useHttpsWithDmaap;
+
 	public static class DistribNotifServiceArtifacts {
 
 		Map<String, Object> service;
@@ -260,6 +262,14 @@ public class DistributionEngineConfiguration extends BasicConfiguration {
 		this.defaultArtifactInstallationTimeout = defaultArtifactInstallationTimeout;
 	}
 
+	public boolean isUseHttpsWithDmaap() {
+		return useHttpsWithDmaap;
+	}
+
+	public void setUseHttpsWithDmaap(boolean useHttpsWithDmaap) {
+		this.useHttpsWithDmaap = useHttpsWithDmaap;
+	}
+
 	public static class CreateTopicConfig {
 
 		private Integer partitionCount;