Deployment onap rename

Changing org.openecomp.appc names to org.onap.appc

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

10 files changed, 39 insertions, 39 deletions

diff --git a/installation/README.md b/installation/README.md
index 42d0e47..2f91b83 100644
--- a/installation/README.md
+++ b/installation/README.md
@@ -1,4 +1,4 @@
-# OpenECOMP APP-C - Available Properties
+# ONAP APP-C - Available Properties
 
 ---
 ---
@@ -38,7 +38,7 @@ The following properties are ready to be defined based on which feature needs to
 
 - appc.asdc.*:
     - Applies to the following feature: appc-asdc-listener-bundle
-    - These properties are used to test integration between the SDC OpenECOMP component & APP-C. Properties such as pointing to the DMaaP listener & topic, SDC credentials to authenticate into the SDC component, define the RESTCONF URL, and others are mapped here.
+    - These properties are used to test integration between the SDC ONAP component & APP-C. Properties such as pointing to the DMaaP listener & topic, SDC credentials to authenticate into the SDC component, define the RESTCONF URL, and others are mapped here.
 
 - Other properties:
     - poolMembers, event.pool.members, restconf.user, restconf.pass
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index db3ef98..3cebf5e 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.openecomp.appc.deployment</groupId>
+		<groupId>org.onap.appc.deployment</groupId>
 		<artifactId>installation</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.appc.deployment</groupId>
+	<groupId>org.onap.appc.deployment</groupId>
 	<artifactId>installation-appc</artifactId>
 	<version>1.3.0-SNAPSHOT</version>
 
@@ -18,7 +18,7 @@
 	<description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
 
 	<properties>
-		<image.name>openecomp/appc-image</image.name>
+		<image.name>onap/appc-image</image.name>
 		<appc.release.version>1.3.0</appc.release.version>
 		<appc.snapshot.version>1.3.0-SNAPSHOT</appc.snapshot.version>
                 <!--This version will be over-ridden by jenkins 
@@ -63,7 +63,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/bin</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/scripts</directory>
@@ -83,7 +83,7 @@
 						</goals>
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/resources</directory>
@@ -104,7 +104,7 @@
 						</goals>
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/stores</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/stores</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/stores</directory>
@@ -125,7 +125,7 @@
 						</goals>
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/properties</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/properties</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/properties</directory>
@@ -159,7 +159,7 @@
 							</environmentVariables>
 							<arguments>
 								<argument>${basedir}/src/main/scripts/installZips.sh</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -173,7 +173,7 @@
 						<configuration>
 							<executable>find</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 								<argument>-name</argument>
 								<argument>*.sh</argument>
 								<argument>-exec</argument>
@@ -304,7 +304,7 @@
 								</goals><!-- here the phase you need -->
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/bin</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
 									<resources>
 										<resource>
 											<directory>src/main/scripts</directory>
@@ -324,7 +324,7 @@
 								</goals>
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data</outputDirectory>
 									<resources>
 										<resource>
 											<directory>src/main/resources</directory>
@@ -345,7 +345,7 @@
 								</goals>
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/stores</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/stores</outputDirectory>
 									<resources>
 										<resource>
 											<directory>../src/main/stores</directory>
@@ -366,7 +366,7 @@
 								</goals>
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/properties</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/properties</outputDirectory>
 									<resources>
 										<resource>
 											<directory>../src/main/properties</directory>
@@ -400,7 +400,7 @@
 									</environmentVariables>
 									<arguments>
 										<argument>${basedir}/src/main/scripts/installZips.sh</argument>
-										<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+										<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 									</arguments>
 								</configuration>
 							</execution>
@@ -414,7 +414,7 @@
 								<configuration>
 									<executable>find</executable>
 									<arguments>
-										<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+										<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 										<argument>-name</argument>
 										<argument>*.sh</argument>
 										<argument>-exec</argument>
@@ -434,7 +434,7 @@
 	</profiles>
 	
 	<organization>
-		<name>openECOMP</name>
+		<name>ONAP</name>
 	</organization>
 	
 </project>
diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 7dd115a..4d72862 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -3,11 +3,11 @@ FROM onap/ccsdk-odlsli-image:v0.1.0
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 # Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
-ENV APPC_CONFIG_DIR /opt/openecomp/appc/data/properties
+ENV APPC_CONFIG_DIR /opt/onap/appc/data/properties
 
 # Copy the opt folder to the container's /opt folder
 COPY opt /opt
-RUN ln -s /opt/openecomp/appc /opt/appc
+RUN ln -s /opt/onap/appc /opt/appc
 
 # Expose port 8181 for ODL REST calls
 EXPOSE 8181
diff --git a/installation/appc/src/main/scripts/installAppcDb.sh b/installation/appc/src/main/scripts/installAppcDb.sh
index 115af6b..fc5ae53 100644
--- a/installation/appc/src/main/scripts/installAppcDb.sh
+++ b/installation/appc/src/main/scripts/installAppcDb.sh
@@ -19,7 +19,7 @@
 ###
 
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
 APPC_DB_USER=${APPC_DB_USER:-appcctl}
diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh
index 4fc7f08..556bdd8 100644
--- a/installation/appc/src/main/scripts/installFeatures.sh
+++ b/installation/appc/src/main/scripts/installFeatures.sh
@@ -22,7 +22,7 @@
 ###
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 APPC_FEATURE_DIR=${APPC_FEATURE_DIR:-${APPC_HOME}/features}
 
 function featureInstall {
diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh
index 41f7b89..8d8213d 100644
--- a/installation/appc/src/main/scripts/installZips.sh
+++ b/installation/appc/src/main/scripts/installZips.sh
@@ -28,7 +28,7 @@ then
   GLOBAL_SETTINGS_FILE=${GLOBAL_SETTINGS_FILE:-${DEFAULT_MAVEN_SETTINGS}}
 fi
 
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 
 targetDir=${1:-${APPC_HOME}}
@@ -86,17 +86,17 @@ echo "Installing APP-C version ${APPC_VERSION}"
 for feature in ${APPC_FEATURES}
 do
  rm -f /tmp/${feature}-installer*.zip
- mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.appc:${feature}-installer:${APPC_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+ mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc:${feature}-installer:${APPC_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
  unzip -d ${featureDir} /tmp/${feature}-installer*zip
 done
 
 echo "Installing platform-logic for APP-C"
 rm -f /tmp/platform-logic-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.appc.deployment:platform-logic-installer:${APPC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.deployment:platform-logic-installer:${APPC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
 unzip -d ${targetDir} /tmp/platform-logic-installer*.zip
 
 echo "Downloading dg-loader-provider jar from nexus"
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.appc.plugins:dg-loader-provider:${APPC_VERSION}:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.plugins:dg-loader-provider:${APPC_VERSION}:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data
 mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar
 
 find ${targetDir} -name '*.sh' -exec chmod +x '{}' \;
diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 7642820..5da71ff 100644
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -29,7 +29,7 @@
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
diff --git a/installation/pom.xml b/installation/pom.xml
index 08fce60..7fb29ae 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.openecomp.appc.deployment</groupId>
+		<groupId>org.onap.appc.deployment</groupId>
 		<artifactId>appc-docker-project</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.appc.deployment</groupId>
+	<groupId>org.onap.appc.deployment</groupId>
 	<artifactId>installation</artifactId>
 	<version>1.3.0-SNAPSHOT</version>
 
diff --git a/installation/src/main/properties/aaiclient.properties b/installation/src/main/properties/aaiclient.properties
index c3cd088..7d33018 100644
--- a/installation/src/main/properties/aaiclient.properties
+++ b/installation/src/main/properties/aaiclient.properties
@@ -25,7 +25,7 @@
 #
 # Certificate keystore and truststore
 #
-org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/openecomp/appc/data/stores/truststore.openecomp.client.jks
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/appc/data/stores/truststore.openecomp.client.jks
 org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
 org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
 
diff --git a/installation/src/main/properties/appc.properties b/installation/src/main/properties/appc.properties
index b447e24..9206c32 100644
--- a/installation/src/main/properties/appc.properties
+++ b/installation/src/main/properties/appc.properties
@@ -41,13 +41,13 @@ appc.topology.dg.method=topology-operation-all
 appc.topology.dg.version=2.0.0
 
 # TEMP - Properties that might be needed to make the AAI-APPC connection
-org.openecomp.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl
-org.openecomp.appc.db.user.appcctl=appcctl
-org.openecomp.appc.db.pass.appcctl=appcctl
+org.onap.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl
+org.onap.appc.db.user.appcctl=appcctl
+org.onap.appc.db.pass.appcctl=appcctl
 
-org.openecomp.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.appc.db.user.sdnctl=sdnctl
-org.openecomp.appc.db.pass.sdnctl=gamma
+org.onap.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl
+org.onap.appc.db.user.sdnctl=sdnctl
+org.onap.appc.db.pass.sdnctl=gamma
 
 
 ###	                                                                	                                                                   ###
@@ -67,8 +67,8 @@ provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 ###	                                                                	                                                                                                                     ###
 ### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904                     ###
-### which is what the Master HEAT Template to instantiate OpenECOMP is pointing to (version R1).  All other default values are                     ###
-### left there since these are pre-defined as part of APP-C/OpenECOMP default instantiation with Master HEAT Template                              ###
+### which is what the Master HEAT Template to instantiate ONAP is pointing to (version R1).  All other default values are                     ###
+### left there since these are pre-defined as part of APP-C/ONAP default instantiation with Master HEAT Template                              ###
 ###		                                                                	                                                                                                                 ###
 
 
@@ -104,7 +104,7 @@ test.vmid=test
 # Port 8774 below is default port for OpenStack's Nova API Service
 test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999
 #skips hypervisor check which usually occurs during iaas-adapter-bundle startup
-org.openecomp.appc.iaas.skiphypervisorcheck=true
+org.onap.appc.iaas.skiphypervisorcheck=true
 
 
 # Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle