43 files changed, 32 insertions, 32 deletions
diff --git a/.gitreview b/.gitreview
index 29ee39e..5a7658f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=gerrit.openecomp.org
+host=gerrit.onap.org
 port=29418
 project=ncomp/maven.git
diff --git a/ncomp-maven-base/pom.xml b/ncomp-maven-base/pom.xml
index 8a6b962..2dac61e 100644
--- a/ncomp-maven-base/pom.xml
+++ b/ncomp-maven-base/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openecomp.ncomp.maven</groupId>
 	<artifactId>ncomp-maven-base</artifactId>
@@ -10,12 +10,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
-		<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
-		<openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+		<openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy>
 		<openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
-	</properties>
+	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
 
 	
 <build>
@@ -63,8 +63,8 @@
 			<url>${openecomp.nexus.snapshots}</url>
 		</snapshotRepository>
 		<site>
-			<id>dcae-javadoc</id>
-			<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+			<id>ecomp-site</id>
+			<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url>
 		</site>
 	</distributionManagement>
 	
diff --git a/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml b/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml
index c8e4522..defa15d 100644
--- a/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml
+++ b/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>GNAMEEEE</groupId>
@@ -10,7 +10,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+  <nexusproxy>https://nexus.onap.org</nexusproxy></properties>
 
   <modules>
     MMMM
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
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/adaptor:MANIFEST.MF b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/adaptor%MANIFEST.MF
index 2c0b508..2c0b508 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/adaptor:MANIFEST.MF
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/adaptor%MANIFEST.MF
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager:MANIFEST.MF b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager%MANIFEST.MF
index b9b8695..b9b8695 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager:MANIFEST.MF
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-cdap-manager%MANIFEST.MF
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager:MANIFEST.MF b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager%MANIFEST.MF
index ae75246..ae75246 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager:MANIFEST.MF
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-docker-manager%MANIFEST.MF
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager:MANIFEST.MF b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager%MANIFEST.MF
index 9198ee6..9198ee6 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager:MANIFEST.MF
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/META-INF/dcae-vm-manager%MANIFEST.MF
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager:plugin.xml b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager%plugin.xml
index 8e8a0ed..8e8a0ed 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager:plugin.xml
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager%plugin.xml
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager:pom.xml b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager%pom.xml
index ec2944d..ec2944d 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager:pom.xml
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-cdap-manager%pom.xml
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager:plugin.xml b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager%plugin.xml
index 8e8a0ed..8e8a0ed 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager:plugin.xml
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager%plugin.xml
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager:pom.xml b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager%pom.xml
index 84200c4..84200c4 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager:pom.xml
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-docker-manager%pom.xml
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager:plugin.xml b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager%plugin.xml
index 8e8a0ed..8e8a0ed 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager:plugin.xml
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager%plugin.xml
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager:pom.xml b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager%pom.xml
index c0ae0c5..c0ae0c5 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager:pom.xml
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/dcae-vm-manager%pom.xml
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/adaptor:adaptor.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/adaptor%adaptor.xcore
index 6cff5cc..6cff5cc 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/adaptor:adaptor.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/adaptor%adaptor.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager:manager.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager%manager.xcore
index 4ed7427..4ed7427 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager:manager.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager%manager.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager:service.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager%service.xcore
index 2f702b6..2f702b6 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager:service.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-cdap-manager%service.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager:manager.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager%manager.xcore
index 4be92d2..4be92d2 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager:manager.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager%manager.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager:service.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager%service.xcore
index 18d97ba..18d97ba 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager:service.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-docker-manager%service.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager:manager.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager%manager.xcore
index 421935e..421935e 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager:manager.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager%manager.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager:service.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager%service.xcore
index cab5096..cab5096 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager:service.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/dcae-vm-manager%service.xcore
diff --git a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/server:server.xcore b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/server%server.xcore
index bcd8cf6..bcd8cf6 100644
--- a/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/server:server.xcore
+++ b/ncomp-maven-xcore-project/src/main/resources/archetype-resources/src/main/xcore/server%server.xcore
diff --git a/ncomp-maven-xcore/pom.xml b/ncomp-maven-xcore/pom.xml
index f3b0204..b2aacb3 100644
--- a/ncomp-maven-xcore/pom.xml
+++ b/ncomp-maven-xcore/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openecomp.ncomp.maven</groupId>
 	<artifactId>ncomp-maven-xcore</artifactId>
@@ -10,12 +10,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
-		<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
-		<openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+		<openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy>
 		<openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
-	</properties>
+	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
 
 
 	<build>
@@ -55,8 +55,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
-					<source />
-					<target />
+					<source/>
+					<target/>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -103,8 +103,8 @@
 			<url>${openecomp.nexus.snapshots}</url>
 		</snapshotRepository>
 		<site>
-			<id>dcae-javadoc</id>
-			<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+			<id>ecomp-site</id>
+			<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url>
 		</site>
 	</distributionManagement>
 
diff --git a/pom.xml b/pom.xml
index d1367df..541ee7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openecomp.ncomp.maven</groupId>
 	<artifactId>ncomp-maven</artifactId>
@@ -10,12 +10,12 @@
 	  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	  <maven.compiler.target>1.7</maven.compiler.target>
 	  <maven.compiler.source>1.7</maven.compiler.source>
-		<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
-		<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
-		<openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+		<openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy>
 		<openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
-	</properties>
+	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
 
 	
 		
@@ -67,8 +67,8 @@
 				<url>${openecomp.nexus.snapshots}</url>
 			</snapshotRepository>
 			<site>
-				<id>dcae-javadoc</id>
-				<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+				<id>ecomp-site</id>
+				<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url>
 			</site>
 		</distributionManagement>