Fourth part of onap rename

Some paths within the docker image need to be updated from
opt/openecomp to opt/onap

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

34 files changed, 36 insertions, 36 deletions

diff --git a/README.md b/README.md
index d409e1575..0c841ccc1 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ Each APPC component depends on the property values that are defined for them in
 
 Currently, there are two ways to change properties for APPC Features:
 - Permanent Change: In appc.properties, change property values as needed and commit changes in your current git repo where your APPC Deployment code repo is at. Then, run your Jenkins job that deploys the APPC Docker Image (make sure the Jenkins Job configuration points to the branch where you just commited the properties change) to make sure that APPC Docker Image contains latest changes of appc.properties from the beginning (of course, the Host VM where the docker containers will be deployed at needs to update images with "docker-compose pull" to pick up the changes you just committed and compiled).
-- Temporary Change (for quick testing/debugging): In the APPC Docker Container, find the appc.properties file in /opt/openecomp/appc/properties/appc.properties and make changes as needed. Then, restart the APPC Docker Container by running "docker stop <APPC_DOCKER_CONTAINER>" then "docker start <APPC_DOCKER_CONTAINER>")  (NOTE: This approach will lose all changes done in appc.properties if the docker container is destroyed instead of stopped).
+- Temporary Change (for quick testing/debugging): In the APPC Docker Container, find the appc.properties file in /opt/onap/appc/properties/appc.properties and make changes as needed. Then, restart the APPC Docker Container by running "docker stop <APPC_DOCKER_CONTAINER>" then "docker start <APPC_DOCKER_CONTAINER>")  (NOTE: This approach will lose all changes done in appc.properties if the docker container is destroyed instead of stopped).
 
 # Additional Notes
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/onap/appc/default.properties
index bb888132a..2f8fb4585 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/onap/appc/default.properties
index c00220dd6..0674ff4f1 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/onap/appc/default.properties
index bb888132a..2f8fb4585 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/onap/appc/default.properties
index 280b85c00..8951f0783 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/onap/appc/default.properties
@@ -25,4 +25,4 @@
 # ${user.home} usually goes to /root if instantiation uses the appc-docker approach
 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties
index dd594515c..c68d3e658 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties
@@ -23,7 +23,7 @@
 ###
 
 org.onap.appc.bootstrap.file=test.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 # Properties commented out below are provided in appc.properties
 #poolMembers=<DMAAP_IP>:3904
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/onap/appc/default.properties
index a326faada..ea75502b8 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/onap/appc/default.properties
@@ -23,4 +23,4 @@
 ###
 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/onap/appc/default.properties
index a326faada..ea75502b8 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/onap/appc/default.properties
@@ -23,4 +23,4 @@
 ###
 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/onap/appc/default.properties
index 1ecb98c01..295a3b6e8 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/onap/appc/default.properties
index d63c49143..018516319 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/onap/appc/default.properties
index 5e4516a3b..9530d4890 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/onap/appc/default.properties
@@ -23,7 +23,7 @@
 ###
 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 org.onap.appc.netconf.db.jdbc.driver=netconfctl
 org.onap.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/onap/appc/default.properties
index c00220dd6..0674ff4f1 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/onap/appc/default.properties
index 84cd0beb6..52d62c1ce 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/onap/appc/default.properties b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/onap/appc/default.properties
index 248aabbd8..0c200605d 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/onap/appc/default.properties
@@ -30,7 +30,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/onap/appc/default.properties
index 881ceab82..43693a9ba 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/onap/appc/default.properties
@@ -30,20 +30,20 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
 # to supply configuration options
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded
-org.onap.appc.resources=/opt/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=/opt/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
 org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.onap.appc.logging.file=/opt/openecomp/appc/logback.xml
+org.onap.appc.logging.file=/opt/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
diff --git a/appc-common/src/main/java/org/onap/appc/configuration/Configuration.java b/appc-common/src/main/java/org/onap/appc/configuration/Configuration.java
index a0acf12cc..937b34196 100644
--- a/appc-common/src/main/java/org/onap/appc/configuration/Configuration.java
+++ b/appc-common/src/main/java/org/onap/appc/configuration/Configuration.java
@@ -43,7 +43,7 @@ public interface Configuration {
     String PROPERTY_BOOTSTRAP_FILE_NAME = "org_onap_appc_bootstrap_file"; //
     String DEFAULT_BOOTSTRAP_FILE_NAME = "appc.properties"; 
     String PROPERTY_BOOTSTRAP_FILE_PATH = "org_onap_appc_bootstrap_path"; //
-    String DEFAULT_BOOTSTRAP_FILE_PATH = "/opt/openecomp/appc/data/properties,${user.home},etc,../etc";
+    String DEFAULT_BOOTSTRAP_FILE_PATH = "/opt/onap/appc/data/properties,${user.home},etc,../etc";
     String PROPERTY_RESOURCE_BUNDLES = "org.onap.appc.resources"; 
     String DEFAULT_RESOURCE_BUNDLES = "org/onap/appc/i18n/MessageResources";
 
diff --git a/appc-common/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java b/appc-common/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java
index ee2648847..47ffca7e4 100644
--- a/appc-common/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java
+++ b/appc-common/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java
@@ -92,7 +92,7 @@ import com.att.eelf.i18n.EELFResourceManager;
  * <dd>This is a comma-delimited (,) path of directories to be searched to locate the specified file. The first
  * occurrence of the file is the one loaded, and no additional searching is performed. The path can be specified in
  * either, or both, the default values and the command line specification. If specified on the command line, the value
- * overrides the default values. If omitted, the default path is <code>$/opt/openecomp/appc/data/properties,${user.home},.</code></dd>
+ * overrides the default values. If omitted, the default path is <code>$/opt/onap/appc/data/properties,${user.home},.</code></dd>
  * </dl>
  *
  * @since Mar 18, 2014
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/onap/appc/default.properties b/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/onap/appc/default.properties
index 0185c72a9..bd1bc65d3 100644
--- a/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/onap/appc/default.properties
@@ -25,5 +25,5 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 #
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/onap/appc/default.properties b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/onap/appc/default.properties
index ec2a2b709..eb9329d79 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/org/onap/appc/default.properties
@@ -23,7 +23,7 @@
 ###
 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 org.onap.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
 org.onap.appc.netconf.db.user.netconfctl=test
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/onap/appc/default.properties
index 1a4f859db..f24ee14ee 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties
index c5130b3ab..45b762c05 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
 #org.onap.appc.bootstrap.file=executor-test.properties
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 
 #
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties
index f775abb39..c8153a36c 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
 appc.LCM.poolMembers=<DMAAP_IP>:3904
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/onap/appc/default.properties
index 9bf3b6c1a..e11308cd3 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
index 80e77b261..e42d7ef74 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
 #org.onap.appc.bootstrap.file=executor-test.properties
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 #
 # Certificate keystore and truststore
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/onap/appc/default.properties
index 55249d0f9..3dd30a87b 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties
index 227a83753..9848f618f 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
 #org.onap.appc.bootstrap.file=executor-test.properties
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 
 #
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/onap/appc/default.properties b/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/onap/appc/default.properties
index 839faddac..19838f51b 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/resources/org/onap/appc/default.properties
@@ -35,7 +35,7 @@
 
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 
 
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/onap/appc/default.properties b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/onap/appc/default.properties
index 0c4de19aa..b52a4429f 100644
--- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/onap/appc/default.properties
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 #Property below provided by appc.properties
 appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm
diff --git a/appc-metric/appc-metric-bundle/src/main/resources/org/onap/appc/default.properties b/appc-metric/appc-metric-bundle/src/main/resources/org/onap/appc/default.properties
index f7eae381e..e42cf60ec 100644
--- a/appc-metric/appc-metric-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-metric/appc-metric-bundle/src/main/resources/org/onap/appc/default.properties
@@ -25,7 +25,7 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 
 
diff --git a/appc-metric/appc-metric-bundle/src/test/resources/org/onap/appc/default.properties b/appc-metric/appc-metric-bundle/src/test/resources/org/onap/appc/default.properties
index 596705820..5d4dffd2a 100644
--- a/appc-metric/appc-metric-bundle/src/test/resources/org/onap/appc/default.properties
+++ b/appc-metric/appc-metric-bundle/src/test/resources/org/onap/appc/default.properties
@@ -25,5 +25,5 @@
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options
 #org.onap.appc.bootstrap.file=executor-test.properties
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties b/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
index 964040a18..e7091b191 100644
--- a/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
@@ -38,7 +38,7 @@
 #
 #--------------------------------------------------------------------------------------------
 # The path and file used to load user-supplied configuration settings, if any 
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 org.onap.appc.bootstrap.file=appc.properties
 
 appc.application.name=APPC
diff --git a/appc-provider/appc-provider-bundle/src/main/resources/org/onap/appc/default.properties b/appc-provider/appc-provider-bundle/src/main/resources/org/onap/appc/default.properties
index 5e9258a09..693cd37a8 100644
--- a/appc-provider/appc-provider-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-provider/appc-provider-bundle/src/main/resources/org/onap/appc/default.properties
@@ -39,7 +39,7 @@
 #--------------------------------------------------------------------------------------------
 # The path and file used to load user-supplied configuration settings, if any 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/onap/appc/default.properties b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/onap/appc/default.properties
index f8c5e8e2e..99117ea25 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/onap/appc/default.properties
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/onap/appc/default.properties
@@ -23,7 +23,7 @@
 ###
 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 # These SDC properties were provided by the SDC Op-So team
 appc.sdc.keystore.path=etc/sdc-client.jks
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties
index d9ba7a045..a978237da 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org.openecomp.appc/default.properties
@@ -35,7 +35,7 @@
 #--------------------------------------------------------------------------------------------
 # The path and file used to load user-supplied configuration settings, if any 
 org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 
 appc.application.name=APPC