[VID-6] Initial rebase push

Change-Id: I9077be9663754d9b22f77c6a7b3109b361b39346
Signed-off-by: jimmydot <jf2512@att.com>

13 files changed, 405 insertions, 402 deletions

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index 3dd6666f5..a8e3903cf 100644..100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -1,87 +1,88 @@
-<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.vid</groupId>
-		<artifactId>vid-parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-
-	<packaging>pom</packaging>
-	<groupId>org.openecomp.vid</groupId>
-	<artifactId>vid-deliveries</artifactId>
-
-	<name>VID Deliveries</name>
-	<description>ECOMP VID Deliveries</description>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<docker.push.registry>${docker_registry}</docker.push.registry>
-		<docker.verbose>true</docker.verbose>
-	</properties>
-
-	<build>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.16.5</version>
-
-				<configuration>
-					<verbose>true</verbose>
-
-					<apiVersion>1.23</apiVersion>
-					<images>
-						<image>
-							<name>openecomp/vid:${project.version}</name>
-							<build>
-								<cleanup>remove</cleanup>
-								<dockerFileDir>docker-files</dockerFileDir>
-								<assembly>
-									<basedir>/</basedir>
-									<user>vidadmin:vidadmin:vidadmin</user>
-									<descriptor>assembly/assembly-for-plugin.xml</descriptor>
-								</assembly>
-								<tags>
-								  <tag>1.1-STAGING-latest</tag>
-								</tags>
-							</build>
-						</image>
-					</images>
-				</configuration>
-
-				<executions>
-					<execution>
-						<id>generate-image</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>build</goal>
-						</goals>
-					</execution>
-					
-					<execution>
-						<id>push-image</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>build</goal>
-							<goal>push</goal>
-						</goals>
-					</execution>
-				</executions>
-
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
+<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.vid</groupId>

+		<artifactId>vid-parent</artifactId>

+		<version>1.0.0</version>

+	</parent>

+

+	<packaging>pom</packaging>

+	<groupId>org.openecomp.vid</groupId>

+	<artifactId>vid-deliveries</artifactId>

+

+	<name>VID Deliveries</name>

+	<description>ECOMP VID Deliveries</description>

+	<properties>

+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

+		<docker.push.registry>${docker_registry}</docker.push.registry>

+		<docker.verbose>true</docker.verbose>

+	</properties>

+

+	<build>

+		<finalName>${project.artifactId}-${project.version}</finalName>

+		<plugins>

+			<plugin>

+				<groupId>io.fabric8</groupId>

+				<artifactId>docker-maven-plugin</artifactId>

+				<version>0.16.5</version>

+

+				<configuration>

+					<verbose>true</verbose>

+

+					<apiVersion>1.23</apiVersion>

+					<images>

+						<image>

+							<name>openecomp/vid:${project.version}</name>

+							<build>

+								<cleanup>remove</cleanup>

+								<dockerFileDir>docker-files</dockerFileDir>

+								<assembly>

+									<basedir>/</basedir>

+									<user>vidadmin:vidadmin:vidadmin</user>

+									<descriptor>assembly/assembly-for-plugin.xml</descriptor>

+								</assembly>

+								<tags>

+								  <tag>1.0-STAGING-latest</tag>

+								</tags>

+								    

+							</build>

+						</image>

+					</images>

+				</configuration>

+

+				<executions>

+					<execution>

+						<id>generate-image</id>

+						<phase>deploy</phase>

+						<goals>

+							<goal>build</goal>

+						</goals>

+					</execution>

+					

+					<execution>

+						<id>push-image</id>

+						<phase>deploy</phase>

+						<goals>

+							<goal>build</goal>

+							<goal>push</goal>

+						</goals>

+					</execution>

+				</executions>

+

+			</plugin>

+

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-deploy-plugin</artifactId>

+				<version>2.8</version>

+				<configuration>

+					<skip>true</skip>

+				</configuration>

+			</plugin>

+		</plugins>

+	</build>

+

+</project>

diff --git a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml
index 2755e7e19..35c203352 100644..100755
--- a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml
+++ b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml
@@ -1,31 +1,31 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-	<id>assembly-for-war</id>
-
-	<fileSets>
-		<fileSet>
-			<includes>
-				<include>vid.war</include>
-			</includes>
-			<directory>../vid/target/</directory>
-			<outputDirectory>artifacts</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<includes>
-				<include>vid-pre-init.sql</include>
-			</includes>
-			<directory>../vid/src/main/resources</directory>
-			<outputDirectory>scripts</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<includes>
-				<include>*.sh</include>
-			</includes>
-			<directory>src/main/scripts</directory>
-			<outputDirectory>scripts</outputDirectory>
-		</fileSet>
-	</fileSets>
-	
-</assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

+

+	<id>assembly-for-war</id>

+

+	<fileSets>

+		<fileSet>

+			<includes>

+				<include>vid.war</include>

+			</includes>

+			<directory>../epsdk-app-onap/target/</directory>

+			<outputDirectory>artifacts</outputDirectory>

+		</fileSet>

+		<fileSet>

+			<includes>

+				<include>vid-pre-init.sql</include>

+			</includes>

+			<directory>../epsdk-app-onap/src/main/resources</directory>

+			<outputDirectory>scripts</outputDirectory>

+		</fileSet>

+		<fileSet>

+			<includes>

+				<include>*.sh</include>

+			</includes>

+			<directory>src/main/scripts</directory>

+			<outputDirectory>scripts</outputDirectory>

+		</fileSet>

+	</fileSets>

+	

+</assembly>

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index ffe2b4665..d112738b2 100644..100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,72 +1,74 @@
-FROM tomcat:8.0-jre8
-
-RUN apt-get update && apt-get install -y \
-	openjdk-8-jdk
-
-ENV ROOT_DIR /opt/app/vid
-
-ENV ASDC_CLIENT_TYPE REST
-ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.openecomp.org
-#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z
-ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
-ENV ASDC_CLIENT_REST_PROTOCOL http
-ENV ASDC_CLIENT_REST_PORT 8080
-
-ENV CACHE_DIRECTORY $ROOT_DIR/cache
-
-ENV LOG4J_LOGLEVEL INFO
-ENV LOG4J_APPENDER rollingfile
-ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs
-
-ENV VID_AAI_HOST aai.api.simpledemo.openecomp.org
-ENV VID_AAI_PORT 8443
-ENV VID_APP_DISPLAY_NAME VID
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context
-ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080
-ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks
-ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins
-ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42
-ENV VID_MSO_USER InfraPortalClient
-ENV VID_MSO_PASS 51515201a8d4c5c08d533db9bd1e1a9b
-ENV MSO_DME2_CLIENT_TIMEOUT 10000
-ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000
-ENV MSO_DME2_SERVER_URL http://localhost:8081
-ENV MSO_DME2_ENABLED false
-ENV MSO_POLLING_INTERVAL_MSECS 10000
-ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore
-ENV AAI_TRUSTSTORE_PASSWD_X 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42
-ENV AAI_KEYSTORE_FILENAME tomcat_keystore
-ENV AAI_KEYSTORE_PASSWD_X 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42
-ENV AAI_VID_UID VID
-ENV AAI_VID_PASSWD_X b78b4808b37a8aadf02a5cc0004f1ad0
-
-ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
-ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context
-ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com
-
-ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=
-ENV VID_UEB_URL_LIST vm1-message-router
-ENV VID_UEB_CONSUMER_GROUP VID
-ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX
-ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD
-ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da
-ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90
-ENV VID_UEB_LISTENERS_ENABLE false
-
-ENV VID_LOG_DIR ${ROOT_DIR}/logs
-ENV VID_LOG_LEVEL INFO
-
-ENV VID_MYSQL_HOST vid-mariadb-docker-instance
-ENV VID_MYSQL_PORT 3306
-ENV VID_MYSQL_DBNAME vid_portal
-ENV VID_MYSQL_USER vidadmin
-ENV VID_MYSQL_MAXCONNECTIONS 5
-ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-ADD maven/scripts/*.sh /tmp/vid/
-ADD maven/artifacts/vid.war /tmp/vid/stage/
-
-RUN chmod +x /tmp/vid/localize.sh
-
-CMD ["/tmp/vid/localize.sh"]
+FROM tomcat:8.0-jre8

+

+RUN apt-get update && apt-get install -y \

+	openjdk-8-jdk

+

+ENV ROOT_DIR /opt/app/vid

+

+ENV ASDC_CLIENT_TYPE REST

+ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.openecomp.org

+#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z

+ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=

+ENV ASDC_CLIENT_REST_PROTOCOL http

+ENV ASDC_CLIENT_REST_PORT 8080

+ENV ASDC_CLIENT_MODEL_NAMESPACE org.openecomp

+

+ENV CACHE_DIRECTORY $ROOT_DIR/cache

+

+ENV LOG4J_LOGLEVEL INFO

+ENV LOG4J_APPENDER rollingfile

+ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs

+

+ENV VID_AAI_HOST aai.api.simpledemo.openecomp.org

+ENV VID_AAI_PORT 8443

+ENV VID_APP_DISPLAY_NAME VID

+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context

+ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080

+ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks

+ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins

+ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42

+ENV VID_MSO_USER InfraPortalClient

+ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz

+ENV MSO_DME2_CLIENT_TIMEOUT 10000

+ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000

+ENV MSO_DME2_SERVER_URL http://localhost:8081

+ENV MSO_DME2_ENABLED false

+ENV MSO_POLLING_INTERVAL_MSECS 10000

+ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore

+ENV AAI_TRUSTSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp

+ENV AAI_KEYSTORE_FILENAME tomcat_keystore

+ENV AAI_KEYSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp

+ENV AAI_VID_UID VID

+ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9

+ENV AAI_USE_CLIENT_CERT false

+ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED

+ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm

+ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi

+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context

+ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com

+

+ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=

+ENV VID_UEB_URL_LIST vm1-message-router

+ENV VID_UEB_CONSUMER_GROUP VID

+ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX

+ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD

+ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da

+ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90

+ENV VID_UEB_LISTENERS_ENABLE false

+

+ENV VID_LOG_DIR ${ROOT_DIR}/logs

+ENV VID_LOG_LEVEL INFO

+

+ENV VID_MYSQL_HOST vid-mariadb-docker-instance

+ENV VID_MYSQL_PORT 3306

+ENV VID_MYSQL_DBNAME vid_portal

+ENV VID_MYSQL_USER vidadmin

+ENV VID_MYSQL_MAXCONNECTIONS 5

+ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

+

+ADD maven/scripts/*.sh /tmp/vid/

+ADD maven/artifacts/vid.war /tmp/vid/stage/

+

+RUN chmod +x /tmp/vid/localize.sh

+

+CMD ["/tmp/vid/localize.sh"]

diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml
index 60599bc98..25a7acfc3 100644..100755
--- a/deliveries/src/main/docker/docker-files/docker-compose.yml
+++ b/deliveries/src/main/docker/docker-files/docker-compose.yml
@@ -1,14 +1,14 @@
-version: '2'
-services:
-        vid-server:
-                image: openecomp/vid
-                ports:
-                - "8080:8080"
-                links:
-                - vid-mariadb:vid-mariadb-docker-instance
-        vid-mariadb:
-                image: mariadb:10.1.11
-                ports:
-                - "3306:3306"
-                volumes:
-                - /var/lib/mysql
+version: '2'

+services:

+        vid-server:

+                image: openecomp/vid

+                ports:

+                - "8080:8080"

+                links:

+                - vid-mariadb:vid-mariadb-docker-instance

+        vid-mariadb:

+                image: mariadb:10.1.11

+                ports:

+                - "3306:3306"

+                volumes:

+                - /var/lib/mysql

diff --git a/deliveries/src/main/scripts/localize.sh b/deliveries/src/main/scripts/localize.sh
index 3966f7023..e72d622b4 100644..100755
--- a/deliveries/src/main/scripts/localize.sh
+++ b/deliveries/src/main/scripts/localize.sh
@@ -1,18 +1,18 @@
-#!/bin/bash
-
-#Extract the WAR so it can be customized by the localization script
-cd /tmp/vid/stage
-jar -xf vid.war
-
-source /tmp/vid/localize_war.sh || {
-	echo "ERROR: Localization script failed"
-	exit 2
-}
-
-#Create the customized WAR and deploy it to Tomcat
-mkdir -p /tmp/vid/deployed
-cd /tmp/vid/stage
-jar -cvf /tmp/vid/deployed/vid.war .
-cd
-mv -f /tmp/vid/deployed/vid.war /usr/local/tomcat/webapps
-catalina.sh run
+#!/bin/bash

+

+#Extract the WAR so it can be customized by the localization script

+cd /tmp/vid/stage

+jar -xf vid.war

+

+source /tmp/vid/localize_war.sh || {

+	echo "ERROR: Localization script failed"

+	exit 2

+}

+

+#Create the customized WAR and deploy it to Tomcat

+mkdir -p /tmp/vid/deployed

+cd /tmp/vid/stage

+jar -cvf /tmp/vid/deployed/vid.war .

+cd

+mv -f /tmp/vid/deployed/vid.war /usr/local/tomcat/webapps

+catalina.sh run

diff --git a/deliveries/src/main/scripts/localize_asdc.sh b/deliveries/src/main/scripts/localize_asdc.sh
index 549c17af1..9a25b61dc 100644..100755
--- a/deliveries/src/main/scripts/localize_asdc.sh
+++ b/deliveries/src/main/scripts/localize_asdc.sh
@@ -1,17 +1,17 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc.properties
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc_template.properties
-
-echo "Localizing the ASDC client configuration"
-
-sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \
-	-e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \
-	-e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \
-	-e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \
-	-e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc.properties

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc_template.properties

+

+echo "Localizing the ASDC client configuration"

+

+sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \

+	-e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \

+	-e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \

+	-e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \

+	-e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 4

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

diff --git a/deliveries/src/main/scripts/localize_cache.sh b/deliveries/src/main/scripts/localize_cache.sh
index d25949ccc..7ef90283b 100644..100755
--- a/deliveries/src/main/scripts/localize_cache.sh
+++ b/deliveries/src/main/scripts/localize_cache.sh
@@ -1,15 +1,15 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache.ccf
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache_template.ccf
-
-echo "Localizing the VID cache configuration"
-
-mkdir -p "${CACHE_DIRECTORY}"
-
-sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 3
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache.ccf

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache_template.ccf

+

+echo "Localizing the VID cache configuration"

+

+mkdir -p "${CACHE_DIRECTORY}"

+

+sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 3

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

diff --git a/deliveries/src/main/scripts/localize_log4j.sh b/deliveries/src/main/scripts/localize_log4j.sh
index d2ab2bba4..b3442c8f2 100644..100755
--- a/deliveries/src/main/scripts/localize_log4j.sh
+++ b/deliveries/src/main/scripts/localize_log4j.sh
@@ -1,19 +1,19 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j.properties
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j_template.properties
-
-echo "Localizing the VID log4j configuration"
-
-mkdir -p ${LOG4J_LOGS_DIRECTORY}
-
-sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \
-	-e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \
-	-e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 3
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
-
-
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j.properties

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j_template.properties

+

+echo "Localizing the VID log4j configuration"

+

+mkdir -p ${LOG4J_LOGS_DIRECTORY}

+

+sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \

+	-e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \

+	-e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 3

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

+

+

diff --git a/deliveries/src/main/scripts/localize_logback.sh b/deliveries/src/main/scripts/localize_logback.sh
index 43798eb84..d4e0bcc51 100644..100755
--- a/deliveries/src/main/scripts/localize_logback.sh
+++ b/deliveries/src/main/scripts/localize_logback.sh
@@ -1,16 +1,16 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback.xml
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback_template.xml
-
-echo "Localizing the VID logback configuration"
-
-mkdir -p "${VID_LOG_DIR}"
-
-sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \
-	-e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 3
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback.xml

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback_template.xml

+

+echo "Localizing the VID logback configuration"

+

+mkdir -p "${VID_LOG_DIR}"

+

+sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \

+	-e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 3

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

diff --git a/deliveries/src/main/scripts/localize_portal.sh b/deliveries/src/main/scripts/localize_portal.sh
index 7d630c56b..3ac535136 100644..100755
--- a/deliveries/src/main/scripts/localize_portal.sh
+++ b/deliveries/src/main/scripts/localize_portal.sh
@@ -1,22 +1,22 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal.properties
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal_template.properties
-
-echo "Localizing the VID portal configuration"
-
-sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \
-	-e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \
-	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \
-	-e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \
-	-e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \
-	-e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \
-	-e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \
-	-e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \
-	-e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \
-	-e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal.properties

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal_template.properties

+

+echo "Localizing the VID portal configuration"

+

+sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \

+	-e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \

+	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \

+	-e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \

+	-e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \

+	-e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \

+	-e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \

+	-e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \

+	-e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \

+	-e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 4

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

diff --git a/deliveries/src/main/scripts/localize_quartz.sh b/deliveries/src/main/scripts/localize_quartz.sh
index c284e6c24..242e76da7 100644..100755
--- a/deliveries/src/main/scripts/localize_quartz.sh
+++ b/deliveries/src/main/scripts/localize_quartz.sh
@@ -1,20 +1,20 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz.properties
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz_template.properties
-
-echo "Localizing the VID quartz configuration"
-
-sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
-	-e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \
-	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
-	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \
-	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
-	-e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
-
-
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz.properties

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz_template.properties

+

+echo "Localizing the VID quartz configuration"

+

+sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \

+	-e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \

+	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \

+	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \

+	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \

+	-e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 4

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

+

+

diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh
index 7cd7be68d..12aa0c91a 100644..100755
--- a/deliveries/src/main/scripts/localize_system.sh
+++ b/deliveries/src/main/scripts/localize_system.sh
@@ -1,40 +1,40 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system.properties
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system_template.properties
-
-echo "Localizing the VID system configuration"
-
-mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}"
-
-sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
-	-e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \
-	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
-	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \
-	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
-	-e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \
-	-e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \
-	-e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \
-	-e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \
-	-e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \
-	-e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \
-	-e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \
-	-e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \
-	-e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \
-	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \
-	-e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \
-	-e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \
-	-e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \
-	-e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \
-	-e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \
-	-e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \
-	-e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \
-	-e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \
-	-e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \
-	-e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \
-	-e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
+#!/bin/bash

+

+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system.properties

+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system_template.properties

+

+echo "Localizing the VID system configuration"

+

+mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}"

+

+sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \

+	-e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \

+	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \

+	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \

+	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \

+	-e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \

+	-e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \

+	-e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \

+	-e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \

+	-e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \

+	-e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \

+	-e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \

+	-e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \

+	-e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \

+	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \

+	-e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \

+	-e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \

+	-e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \

+	-e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \

+	-e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \

+	-e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \

+	-e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \

+	-e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \

+	-e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \

+	-e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \

+	-e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {

+		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"

+		exit 4

+	}

+

+echo "Localized ${FINAL_CONFIG_FILE} successfully."

diff --git a/deliveries/src/main/scripts/localize_war.sh b/deliveries/src/main/scripts/localize_war.sh
index f0669e0e6..68149211d 100644..100755
--- a/deliveries/src/main/scripts/localize_war.sh
+++ b/deliveries/src/main/scripts/localize_war.sh
@@ -1,31 +1,31 @@
-#!/bin/bash
-
-source /tmp/vid/localize_logback.sh || {
-	echo "ERROR: Localizing logback.xml failed"
-	exit 1
-}
-
-source /tmp/vid/localize_portal.sh || {
-	echo "ERROR: Localizing portal.properties failed"
-	exit 1
-}
-
-source /tmp/vid/localize_quartz.sh || {
-	echo "ERROR: Localizing quartz.properties failed"
-	exit 1
-}
-
-source /tmp/vid/localize_system.sh || {
-	echo "ERROR: Localizing system.properties failed"
-	exit 1
-}
-
-source /tmp/vid/localize_cache.sh || {
-	echo "ERROR: Localizing cache.ccf failed"
-	exit 1
-}
-
-source /tmp/vid/localize_asdc.sh || {
-	echo "ERROR: Localizing asdc.properties failed"
-	exit 1
-}
+#!/bin/bash

+

+source /tmp/vid/localize_logback.sh || {

+	echo "ERROR: Localizing logback.xml failed"

+	exit 1

+}

+

+source /tmp/vid/localize_portal.sh || {

+	echo "ERROR: Localizing portal.properties failed"

+	exit 1

+}

+

+source /tmp/vid/localize_quartz.sh || {

+	echo "ERROR: Localizing quartz.properties failed"

+	exit 1

+}

+

+source /tmp/vid/localize_system.sh || {

+	echo "ERROR: Localizing system.properties failed"

+	exit 1

+}

+

+source /tmp/vid/localize_cache.sh || {

+	echo "ERROR: Localizing cache.ccf failed"

+	exit 1

+}

+

+source /tmp/vid/localize_asdc.sh || {

+	echo "ERROR: Localizing asdc.properties failed"

+	exit 1

+}