From e3c3eb5012b02d87a8d7143be3c195e86c298461 Mon Sep 17 00:00:00 2001
From: Carsten Lund <lund@research.att.com>
Date: Sun, 16 Apr 2017 14:17:52 +0000
Subject: [DCAE-15] Changes related to version 1.1

See Jira for details

Change-Id: I29280abce45f53e80adf675f48cf1e0fff9e2c0a
Signed-off-by: Carsten Lund <lund@research.att.com>
---
 dcae-controller-core/dcae-controller-operation-utils/.classpath    | 2 --
 .../.settings/org.eclipse.core.resources.prefs                     | 2 ++
 .../dcae-controller-operation-utils/META-INF/MANIFEST.MF           | 7 +------
 .../controller/operation/utils/GenControllerConfiguration.groovy   | 6 ++++++
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs

(limited to 'dcae-controller-core/dcae-controller-operation-utils')

diff --git a/dcae-controller-core/dcae-controller-operation-utils/.classpath b/dcae-controller-core/dcae-controller-operation-utils/.classpath
index b14f8a5..af62a1c 100644
--- a/dcae-controller-core/dcae-controller-operation-utils/.classpath
+++ b/dcae-controller-core/dcae-controller-operation-utils/.classpath
@@ -12,7 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -24,7 +23,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs b/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF b/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF
index a0c1ab8..ed5086e 100644
--- a/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF
+++ b/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF
@@ -4,9 +4,4 @@ Bundle-Name: dcae-controller-operation-utils
 Bundle-SymbolicName: dcae-controller-operation-utils
 Bundle-Version: 1.0.0.qualifier
 Export-Package: org.openecomp.dcae.controller.operation.utils
-Require-Bundle: dcae-controller-service-vm-model;bundle-version="0.1.0",
- dcae-controller-service-vm-adaptor;bundle-version="0.1.0",
- dcae-controller-platform-model;bundle-version="0.1.0",
- ncomp-sirius-manager-console;bundle-version="0.1.0",
- ncomp-sirius-manager-server;bundle-version="0.1.0",
- dcae-controller-core-model;bundle-version="0.1.0"
+
diff --git a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy
index 38f48b0..c007a68 100644
--- a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy
+++ b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy
@@ -336,6 +336,12 @@ class GenControllerConfiguration extends DocUtils {
 		}
 		save("/databus",[streams : platformConfig.streams2bus()]) 
 		save("/cluster",platformConfig.controllerCluster())
+		// version
+		def version = file2object("$release/version.yaml", false)
+		System.err.println "version=$version"
+		if (version != null) {
+			save("/configuration/version",version)
+		}
 	}
 
 	void createLocations() {
-- 
cgit 1.2.3-korg