[DCAE-15] Changes related to version 1.1

See Jira for details

Change-Id: Icf0da6eb1477331d2c8c7b44d0662c820497e428
Signed-off-by: Carsten Lund <lund@research.att.com>

8 files changed, 2 insertions, 1 deletions

diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/Generator.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/Generator.java
index 763adef..3fdf2d7 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/Generator.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/Generator.java
@@ -45,12 +45,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

 		dir= "src/main/sirius-gen/" + dir.replace('.', '/');

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

-		m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");

+		m.setTemplateDirectory("../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");

 		m.setPrefix("PREFIXXXX");

 		m.setPluginName(p.getNsURI());

 		m.setName("AAAA");

 		m.setTitle("AAAA");

 		ControllerGenerator g = new ControllerGenerator(o,m); 

+		g.setVersion("ONAP-R2");
 		g.setEnableIRequestHandler(false);

 		g.setEnableISiriusPlugin(false);

 		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();

diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/adaptor:Generator.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/adaptor%Generator.java
index cf1b251..cf1b251 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/adaptor:Generator.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/adaptor%Generator.java
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-cdap-manager:Generator.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-cdap-manager%Generator.java
index 96e6864..96e6864 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-cdap-manager:Generator.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-cdap-manager%Generator.java
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-docker-manager:Generator.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-docker-manager%Generator.java
index 88766ec..88766ec 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-docker-manager:Generator.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-docker-manager%Generator.java
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:Generator.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%Generator.java
index fa08130..fa08130 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:Generator.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%Generator.java
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:TestManager.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%TestManager.java
index fdc4f7f..fdc4f7f 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:TestManager.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%TestManager.java
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:TestManagerServer.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%TestManagerServer.java
index c054073..c054073 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:TestManagerServer.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%TestManagerServer.java
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:TestServiceToManager.java b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%TestServiceToManager.java
index 2a66c5a..2a66c5a 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager:TestServiceToManager.java
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/dcae-vm-manager%TestServiceToManager.java