17 files changed, 70 insertions, 59 deletions
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
index af6b9f2b8..2f1ad0af2 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor;
+package org.onap.ccsdk.features.rest.adaptor;
 
 public class ConfigRestAdaptorConstants {
     private ConfigRestAdaptorConstants() {
@@ -33,7 +33,7 @@ public class ConfigRestAdaptorConstants {
     public static final String PROPERTY_ENV_PROD = "field";
     public static final String PROPERTY_ENV_SOLO = "solo";
 
-    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.config.rest.adaptors.";
+    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";
     public static final String REST_ADAPTOR_ENV_TYPE = "envtype";
     public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";
     public static final String REST_ADAPTOR_TYPE_SSL = "ssl";
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java
index c6593f128..163c30423 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor;
+package org.onap.ccsdk.features.rest.adaptor;
 
 /**
  * ConfigRestAdaptorException.java Purpose: Provide Configuration Rest Adaptor Exception
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java
index d31aa7e8a..f1a3c7290 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.data;
+package org.onap.ccsdk.features.rest.adaptor.data;
 
 import java.util.Map;
 
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java
index 7829ee6a8..207e87fc3 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -30,10 +30,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.TrustStrategy;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
-import org.onap.ccsdk.config.rest.adaptor.utils.BasicAuthorizationInterceptor;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.utils.BasicAuthorizationInterceptor;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java
index 98c598acb..12e734ad3 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
 
 public interface ConfigRestAdaptorService {
 
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
index 65b9defd3..c05d6979a 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,9 +27,10 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
+
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java
index 46e954fb6..7ebc0ef48 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
 
 interface ConfigRestClientServiceAdapter {
 
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java
index 8cb5e9bea..6f9840a0b 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import java.util.Map;
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java
index e444d9f17..44736deb1 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java
@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import java.util.Map;
 import java.util.UUID;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java
index b28c2c1a1..53b4ddf96 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java
index 4095d62fe..cb618d05a 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 0b6a6ae11..dbc8b5231 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -23,11 +23,11 @@
 	<!-- Expose the Common Component Bean -->
 
 	<bean id="configRestAdaptorService"
-		class="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
+		class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
 		<argument value="/opt/sdnc/data/properties" />
 	</bean>
 
 	<service ref="configRestAdaptorService"
-		interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />
+		interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
 
 </blueprint>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
index 6c7f114eb..2e091591b 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import java.io.FileInputStream;
 import java.util.HashMap;
@@ -25,6 +25,9 @@ import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestClientServiceAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.GenericRestClientAdapterImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.SSLRestClientAdapterImpl;
 
 public class AbstractConfigRestClientAdapterTest {
 
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
index 7e7f52261..f660cca10 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;
@@ -25,7 +25,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
index a5e757213..e8b3a02ed 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
 
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;
@@ -25,7 +25,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java
index e1d0268e1..cee91d297 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
 
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
 
 @SuppressWarnings("squid:S2187")
 public class RestTemplateFactoryTest {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
index 4527e8977..22748259b 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
@@ -18,28 +18,28 @@
 # Configuration file for SDNC Controller Module
 #
 
-org.onap.ccsdk.config.rest.adaptors.envtype=solo
+org.onap.ccsdk.features.rest.adaptors.envtype=solo
 
 # Config Generator Microservices
-org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic
-org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true
-org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
-org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin
-org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
+org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin
 
 # Generic RESTCONF Adaptor
-org.onap.ccsdk.config.rest.adaptors.restconf.type=generic
-org.onap.ccsdk.config.rest.adaptors.restconf.enable=true
-org.onap.ccsdk.config.rest.adaptors.restconf.user=admin
-org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin
-org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/
+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/
 
 # SSL AAI Adaptor
-org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties
-org.onap.ccsdk.config.rest.adaptors.aai.type=ssl
-org.onap.ccsdk.config.rest.adaptors.aai.enable=true
-org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties
+org.onap.ccsdk.features.rest.adaptors.aai.type=ssl
+org.onap.ccsdk.features.rest.adaptors.aai.enable=true
+org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme