First part of onap rename

This is the first commit of the rename. This commit changes
refereces to org.openecomp.appc > org.onap.appc that occur within
files. The package folder structure is not changed in this commit.

Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-13

12 files changed, 86 insertions, 86 deletions

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 29dc9820a..c8735640a 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -2,7 +2,7 @@
 <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>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-rest-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -31,12 +31,12 @@
 			<artifactId>bcprov-jdk15on</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 			<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<classifier>jar-with-dependencies</classifier>
@@ -194,8 +194,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.rest.RestActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.rest</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.rest</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
index b273a5de4..685ae13a9 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
index 3cabd959d..3e224b923 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.rest.impl.RestAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.rest.impl.RestAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
index 3acab7bc5..8542f105a 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -47,24 +47,24 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -73,11 +73,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -103,11 +103,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -133,11 +133,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -163,11 +163,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
index 38c1238cc..a3e6b1db4 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
@@ -24,11 +24,11 @@
 
 
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
index 4fa3c7bf2..3d3f35985 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 import com.att.cdp.zones.model.Server;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
index fae0bd955..bbb37f4cf 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -39,11 +39,11 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import org.json.JSONObject;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.rest.RestAdapter;
-import org.openecomp.appc.adapter.rest.RequestFactory;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.rest.RestAdapter;
+import org.onap.appc.adapter.rest.RequestFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Iterator;
@@ -91,7 +91,7 @@ public class RestAdapterImpl implements RestAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.rest.RestAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.rest.RestAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -197,9 +197,9 @@ public class RestAdapterImpl implements RestAdapter {
     public HttpRequestBase createHttpRequest(String method, Map<String, String> params, RequestContext rc){
         HttpRequestBase httpRequest = null;
         try {
-            String tUrl = params.get("org.openecomp.appc.instance.URI");
-            String haveHeader = params.get("org.openecomp.appc.instance.haveHeader");
-            String headers = params.get("org.openecomp.appc.instance.headers");
+            String tUrl = params.get("org.onap.appc.instance.URI");
+            String haveHeader = params.get("org.onap.appc.instance.haveHeader");
+            String headers = params.get("org.onap.appc.instance.headers");
 
             Supplier<RequestFactory> requestFactory =  RequestFactory::new;
             httpRequest = requestFactory.get().getHttpRequest(method, tUrl);
@@ -213,8 +213,8 @@ public class RestAdapterImpl implements RestAdapter {
                     httpRequest.addHeader(String1, String2);
                 }
             }
-            if (params.containsKey("org.openecomp.appc.instance.requestBody")) {
-                String body = params.get("org.openecomp.appc.instance.requestBody");
+            if (params.containsKey("org.onap.appc.instance.requestBody")) {
+                String body = params.get("org.onap.appc.instance.requestBody");
                 StringEntity bodyParams = new StringEntity (body,"UTF-8");
                 if (method.equals("PUT")){
                     HttpPut httpPut = (HttpPut) httpRequest;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 6b3ca8d5a..c00220dd6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
index 5c027f5bf..65ff0d8f4 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
@@ -24,7 +24,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -42,7 +42,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.exceptions.ZoneException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
@@ -71,8 +71,8 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8080/about/health");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8080/about/health");
+        params.put("org.onap.appc.instance.haveHeader","false");
 
         HttpGet httpGet = ((HttpGet) givenParams(params, "GET"));
 
@@ -85,9 +85,9 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/posttest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
-        params.put("org.openecomp.appc.instance.requestBody", "{\"name\":\"MyNode\", \"width\":200, \"height\":100}");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/posttest");
+        params.put("org.onap.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.requestBody", "{\"name\":\"MyNode\", \"width\":200, \"height\":100}");
 
         HttpPost httpPost = ((HttpPost) givenParams(params, "POST"));
 
@@ -101,9 +101,9 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/puttest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
-        params.put("org.openecomp.appc.instance.requestBody", "{\"name\":\"MyNode2\", \"width\":300, \"height\":300}");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/puttest");
+        params.put("org.onap.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.requestBody", "{\"name\":\"MyNode2\", \"width\":300, \"height\":300}");
 
         HttpPut httpPut = ((HttpPut) givenParams(params, "PUT"));
         //Header headers[] = httpPut.getAllHeaders();
@@ -118,8 +118,8 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/deletetest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/deletetest");
+        params.put("org.onap.appc.instance.haveHeader","false");
 
         HttpDelete httpDelete = ((HttpDelete) givenParams(params, "DELETE"));
 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a9da29b99..7e0154e68 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 6181726f7..c67f0cc8b 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 2726adc6d..84cd0beb6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes