<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/openecomp/vid/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
 \r
                <!-- SONAR -->\r
                <sonar.language>java</sonar.language>\r
                                        </archive>\r
                                        <overlays>\r
                                                <overlay>\r
-                                                       <groupId>org.openecomp.vid</groupId>\r
+                                                       <groupId>org.onap.vid</groupId>\r
                                                        <artifactId>vid-app-common</artifactId>\r
                                                </overlay>\r
                                                <overlay>\r
                        <type>jar</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>jar</type>\r
                        <version>1.0.0</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>jar</type>\r
 
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getResource(java.util.UUID)
+     * @see org.onap.vid.asdc.AsdcClient#getResource(java.util.UUID)
      */
     public Resource getResource(UUID uuid) throws AsdcCatalogException {
         final JSONObject resource = getCatalog().getJSONObject("resources")
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getResources()
+     * @see org.onap.vid.asdc.AsdcClient#getResources()
      */
     public Collection<Resource> getResources() throws AsdcCatalogException {
         final Collection<Resource> resources = new LinkedList<Resource>();
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getResources(java.util.Map)
+     * @see org.onap.vid.asdc.AsdcClient#getResources(java.util.Map)
      */
     public Collection<Resource> getResources(Map<String, String[]> filter) throws AsdcCatalogException {
         final Collection<Resource> resources = new LinkedList<Resource>();
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getService(java.util.UUID)
+     * @see org.onap.vid.asdc.AsdcClient#getService(java.util.UUID)
      */
     public Service getService(UUID uuid) throws AsdcCatalogException {
 
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getServices()
+     * @see org.onap.vid.asdc.AsdcClient#getServices()
      */
     public Collection<Service> getServices() throws AsdcCatalogException {
         final Collection<Service> services = new LinkedList<Service>();
     }
 
     /* (non-Javadoc)
-     * @see org.openecompt.vid.asdc.AsdcClient#getServices(java.util.Map)
+     * @see org.onap.vid.asdc.AsdcClient#getServices(java.util.Map)
      */
     public Collection<Service> getServices(Map<String, String[]> filter) throws AsdcCatalogException {
         final Collection<Service> services = new LinkedList<Service>();
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
+     * @see org.onap.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
      */
     public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException {
         final JSONArray artifacts = getCatalog().getJSONObject("resources")
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getServiceArtifact(java.util.UUID, java.util.UUID)
+     * @see org.onap.vid.asdc.AsdcClient#getServiceArtifact(java.util.UUID, java.util.UUID)
      */
     public Artifact getServiceArtifact(UUID serviceUuid, UUID artifactUuid) throws AsdcCatalogException {
         final JSONArray artifacts = getCatalog().getJSONObject("services")
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)
+     * @see org.onap.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)
      */
     public Path getResourceToscaModel(UUID resourceUuid) throws AsdcCatalogException {
         final String toscaModelURL = getCatalog().getJSONObject("resources")
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)
+     * @see org.onap.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)
      */
     public Path getServiceToscaModel(UUID serviceUuid) throws AsdcCatalogException {
 
 
        }
        
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getResource(java.util.UUID)
+        * @see org.onap.vid.asdc.AsdcClient#getResource(java.util.UUID)
         */
        public Resource getResource(UUID uuid) throws AsdcCatalogException {
                final JSONObject resource = getCatalog().getJSONObject("resources")
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getResources(java.util.Map)
+        * @see org.onap.vid.asdc.AsdcClient#getResources(java.util.Map)
         */
        public Collection<Resource> getResources(Map<String, String[]> filter) throws AsdcCatalogException {
                final Collection<Resource> resources = new LinkedList<Resource> ();
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getService(java.util.UUID)
+        * @see org.onap.vid.asdc.AsdcClient#getService(java.util.UUID)
         */
        public Service getService(UUID uuid) throws AsdcCatalogException {
                final JSONObject service = getCatalog().getJSONObject("services")
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getServices()
+        * @see org.onap.vid.asdc.AsdcClient#getServices()
         */
        public Collection<Service> getServices() throws AsdcCatalogException {
                final Collection<Service> services = new LinkedList<Service> ();
        }
 
        /* (non-Javadoc)
-        * @see org.openecompt.vid.asdc.AsdcClient#getServices(java.util.Map)
+        * @see org.onap.vid.asdc.AsdcClient#getServices(java.util.Map)
         */
        public Collection<Service> getServices(Map<String, String[]> filter) throws AsdcCatalogException {
                final Collection<Service> services = new LinkedList<Service> ();
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
+        * @see org.onap.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
         */
        public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException {
                final JSONArray artifacts = getCatalog().getJSONObject("resources")
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getServiceArtifact(java.util.UUID, java.util.UUID)
+        * @see org.onap.vid.asdc.AsdcClient#getServiceArtifact(java.util.UUID, java.util.UUID)
         */
        public Artifact getServiceArtifact(UUID serviceUuid, UUID artifactUuid) throws AsdcCatalogException {
                final JSONArray artifacts = getCatalog().getJSONObject("services")
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)
+        * @see org.onap.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)
         */
        public Path getResourceToscaModel(UUID resourceUuid) throws AsdcCatalogException {
                final String toscaModelURL = getCatalog().getJSONObject("resources")
        }
 
        /* (non-Javadoc)
-        * @see org.openecomp.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)
+        * @see org.onap.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)
         */
        public Path getServiceToscaModel(UUID serviceUuid) throws AsdcCatalogException {
                final String toscaModelURL = getCatalog().getJSONObject("services")
 
                String methodName = "getClient";
                ClientConfig config = new ClientConfig();
                //config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-               //config.getClasses().add(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+               //config.getClasses().add(org.onap.aai.util.CustomJacksonJaxBJsonProvider.class);
        
                SSLContext ctx = null;
                
 
     private RequestStatus requestStatus;
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#getInstanceIds()
+     * @see org.onap.vid.domain.mso.AsyncRequestStatus#getInstanceIds()
      */
     public InstanceIds getInstanceIds() {
         return instanceIds;
     }
     
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#toString()
+     * @see org.onap.vid.domain.mso.AsyncRequestStatus#toString()
      */
     @Override
     public String toString() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#hashCode()
+     * @see org.onap.vid.domain.mso.AsyncRequestStatus#hashCode()
      */
     @Override
     public int hashCode() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#equals(java.lang.Object)
+     * @see org.onap.vid.domain.mso.AsyncRequestStatus#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object other) {
 
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedInstance#toString()
+     * @see org.onap.vid.domain.mso.RelatedInstance#toString()
      */
     @Override
     public String toString() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedInstance#getAdditionalProperties()
+     * @see org.onap.vid.domain.mso.RelatedInstance#getAdditionalProperties()
      */
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedInstance#setAdditionalProperty(java.lang.String, java.lang.Object)
+     * @see org.onap.vid.domain.mso.RelatedInstance#setAdditionalProperty(java.lang.String, java.lang.Object)
      */
     @JsonAnySetter
     public void setAdditionalProperty(String name, Object value) {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedInstance#hashCode()
+     * @see org.onap.vid.domain.mso.RelatedInstance#hashCode()
      */
     @Override
     public int hashCode() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedInstance#equals(java.lang.Object)
+     * @see org.onap.vid.domain.mso.RelatedInstance#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object other) {
 
 
 //    /** The related model object instance list. */
 //    @JsonProperty("instanceId")
-//    private org.openecomp.vid.domain.mso.InstanceIds instanceId;
+//    private org.onap.vid.domain.mso.InstanceIds instanceId;
     
     /** The additional properties. */
     @JsonIgnore
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedModel#toString()
+     * @see org.onap.vid.domain.mso.RelatedModel#toString()
      */
     @Override
     public String toString() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedModel#getAdditionalProperties()
+     * @see org.onap.vid.domain.mso.RelatedModel#getAdditionalProperties()
      */
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedModel#setAdditionalProperty(java.lang.String, java.lang.Object)
+     * @see org.onap.vid.domain.mso.RelatedModel#setAdditionalProperty(java.lang.String, java.lang.Object)
      */
     @JsonAnySetter
     public void setAdditionalProperty(String name, Object value) {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedModel#hashCode()
+     * @see org.onap.vid.domain.mso.RelatedModel#hashCode()
      */
     @Override
     public int hashCode() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RelatedModel#equals(java.lang.Object)
+     * @see org.onap.vid.domain.mso.RelatedModel#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object other) {
 
  
     
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.Request#getInstanceIds()
+     * @see org.onap.vid.domain.mso.Request#getInstanceIds()
      */
     @JsonProperty("instanceIds")
     public InstanceIds getInstanceIds() {
 
   
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.Request#toString()
+     * @see org.onap.vid.domain.mso.Request#toString()
      */
     @Override
     public String toString() {
     }
     
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.Request#equals(java.lang.Object)
+     * @see org.onap.vid.domain.mso.Request#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object other) {
 
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#toString()
+     * @see org.onap.vid.domain.mso.RequestDetails#toString()
      */
     @Override
     public String toString() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#getAdditionalProperties()
+     * @see org.onap.vid.domain.mso.RequestDetails#getAdditionalProperties()
      */
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#setAdditionalProperty(java.lang.String, java.lang.Object)
+     * @see org.onap.vid.domain.mso.RequestDetails#setAdditionalProperty(java.lang.String, java.lang.Object)
      */
     @JsonAnySetter
     public void setAdditionalProperty(String name, Object value) {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#hashCode()
+     * @see org.onap.vid.domain.mso.RequestDetails#hashCode()
      */
     @Override
     public int hashCode() {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#equals(java.lang.Object)
+     * @see org.onap.vid.domain.mso.RequestDetails#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object other) {
 
     /*
      * (non-Javadoc)
      *
-     * @see org.openecomp.vid.controller.VidService#getServices(java.util.Map)
+     * @see org.onap.vid.controller.VidService#getServices(java.util.Map)
      */
     @Override
     public Collection<Service> getServices(Map<String, String[]> requestParams)
     /*
      * (non-Javadoc)
      *
-     * @see org.openecomp.vid.controller.VidService#getService(java.lang.String)
+     * @see org.onap.vid.controller.VidService#getService(java.lang.String)
      */
     @Override
     public ServiceModel getService(String uuid) throws AsdcCatalogException {