[DCAE-15] Changes related to version 1.1

See Jira for details

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

20 files changed, 2 insertions, 2 deletions

diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/.classpath b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/.classpath
index d2d34b3..89273c0 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/.classpath
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/.classpath
@@ -21,7 +21,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/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/adaptor:MANIFEST.MF b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/adaptor%MANIFEST.MF
index 0fcefb1..0fcefb1 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/adaptor:MANIFEST.MF
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/adaptor%MANIFEST.MF
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager:MANIFEST.MF b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager%MANIFEST.MF
index d9e0351..d9e0351 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager:MANIFEST.MF
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager%MANIFEST.MF
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager:MANIFEST.MF b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager%MANIFEST.MF
index d9e0351..d9e0351 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager:MANIFEST.MF
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager%MANIFEST.MF
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager:MANIFEST.MF b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager%MANIFEST.MF
index d9e0351..d9e0351 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager:MANIFEST.MF
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager%MANIFEST.MF
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
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-cdap-manager:pom.xml b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-cdap-manager%pom.xml
index 6b7040b..6b7040b 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-cdap-manager:pom.xml
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-cdap-manager%pom.xml
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-docker-manager:pom.xml b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-docker-manager%pom.xml
index 3f62af3..3f62af3 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-docker-manager:pom.xml
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-docker-manager%pom.xml
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-vm-manager:pom.xml b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-vm-manager%pom.xml
index 4e7deff..4e7deff 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-vm-manager:pom.xml
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/dcae-vm-manager%pom.xml
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/adaptor:console.groovy b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/adaptor%console.groovy
index 81a5366..81a5366 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/adaptor:console.groovy
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/adaptor%console.groovy
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-cdap-service:console.groovy b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-cdap-service%console.groovy
index e1f1d98..e1f1d98 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-cdap-service:console.groovy
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-cdap-service%console.groovy
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-docker-service:console.groovy b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-docker-service%console.groovy
index e1f1d98..e1f1d98 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-docker-service:console.groovy
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-docker-service%console.groovy
diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-vm-service:console.groovy b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-vm-service%console.groovy
index e1f1d98..e1f1d98 100644
--- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-vm-service:console.groovy
+++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/src/main/server/scripts/dcae-vm-service%console.groovy