aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2017-04-17 17:01:23 +0000
committerGerrit Code Review <gerrit@onap.org>2017-04-17 17:01:23 +0000
commitd3a6735e1f9455a0131b695d837469091334b773 (patch)
tree626f911c494b5e4cac5f8a7cdfef7cc9d0bf0a21
parent0eafcd43f51c50c4a2e53d76f98add278bcca017 (diff)
parent3460b0f2527d86d6d6dcc3ea4ddf5c67dac02b39 (diff)
Merge "[DCAE-15] Changes related to version 1.1"
-rw-r--r--ncomp-maven-sirius-project/src/main/resources/archetype-resources/.classpath1
-rw-r--r--ncomp-maven-sirius-project/src/main/resources/archetype-resources/TOOLS/Generator.java3
2 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/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();