From 5a2b4712b2e1d598950260087101be6fcf59f234 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jh1730@att.com>
Date: Mon, 18 Sep 2017 11:26:58 -0500
Subject: Inherit guard install env properties for cl.

Clean up a few "mso" references.
Disable 1.0.0 template build for now (note that some
references are still pointing to old mso).
Ie., see
https://git.onap.org/policy/drools-applications/tree/controlloop
       /templates/template.demo.v1.0.0/template.demo
       /src/test/java/org/onap/policy/template/demo/TestSO.java

Since this
is going away, rather than maintaining it, and changing this
code, disabling it for the build.
It will be deleted within the next few days.

Issue-ID: POLICY-162
Change-Id: Ibb819a318fbbb2b7f3aa14cdf76155bdec321024
Signed-off-by: Jorge Hernandez <jh1730@att.com>
---
 controlloop/common/actors/actor.test/pom.xml                   |  2 +-
 controlloop/packages/artifacts/pom.xml                         |  8 +-------
 .../basex/src/files/config/controlloop.properties.environment  | 10 +++++++++-
 controlloop/templates/pom.xml                                  |  1 -
 .../src/main/resources/archetype-resources/pom.xml             |  2 +-
 .../templates/template.demo.v1.0.0/template.demo/pom.xml       |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/controlloop/common/actors/actor.test/pom.xml b/controlloop/common/actors/actor.test/pom.xml
index 8fe05432b..c7e240ceb 100644
--- a/controlloop/common/actors/actor.test/pom.xml
+++ b/controlloop/common/actors/actor.test/pom.xml
@@ -17,7 +17,7 @@
 				<configuration>
 					<additionalClasspathElements>
                         <additionalClasspathElement>${settings.localRepository}/org/onap/policy/drools-applications/actor.appc/1.1.0-SNAPSHOT/actor.appc-1.1.0-SNAPSHOT.jar</additionalClasspathElement>
-						<additionalClasspathElement>${settings.localRepository}/org/onap/policy/drools-applications/actor.mso/1.1.0-SNAPSHOT/actor.mso-1.1.0-SNAPSHOT.jar</additionalClasspathElement>
+						<additionalClasspathElement>${settings.localRepository}/org/onap/policy/drools-applications/actor.so/1.1.0-SNAPSHOT/actor.so-1.1.0-SNAPSHOT.jar</additionalClasspathElement>
 					</additionalClasspathElements>
 				</configuration>
 			</plugin>
diff --git a/controlloop/packages/artifacts/pom.xml b/controlloop/packages/artifacts/pom.xml
index f47f2b75d..486c55cb4 100644
--- a/controlloop/packages/artifacts/pom.xml
+++ b/controlloop/packages/artifacts/pom.xml
@@ -110,7 +110,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>mso</artifactId>
+			<artifactId>so</artifactId>
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
@@ -150,11 +150,5 @@
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>archetype-cl-legacy</artifactId>
-			<version>${project.version}</version>
-			<type>jar</type>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/controlloop/packages/basex/src/files/config/controlloop.properties.environment b/controlloop/packages/basex/src/files/config/controlloop.properties.environment
index 34684ae01..1ca906fa0 100644
--- a/controlloop/packages/basex/src/files/config/controlloop.properties.environment
+++ b/controlloop/packages/basex/src/files/config/controlloop.properties.environment
@@ -22,6 +22,9 @@
 # directory, it will be automatically loaded by PDP-D, after being expanded
 # by installation scripts.
 
+sql.db.username=${{SQL_USER}}
+sql.db.password=${{SQL_PASSWORD}}
+
 aai.url=${{AAI_URL}}
 aai.username=${{AAI_USERNAME}}
 aai.password=${{AAI_PASSWORD}}
@@ -32,4 +35,9 @@ so.password=${{SO_PASSWORD}}
 
 vfc.url=${{VFC_URL}}
 vfc.username=${{VFC_USERNAME}}
-vfc.password=${{VFC_PASSWORD}}
\ No newline at end of file
+vfc.password=${{VFC_PASSWORD}}
+
+guard.url=${{GUARD_URL}}
+guard.username=${{GUARD_USERNAME}}
+guard.password=${{GUARD_PASSWORD}}
+guard.jdbc.url=mariadb://${{SQL_HOST}}:3306/operationshistory10
diff --git a/controlloop/templates/pom.xml b/controlloop/templates/pom.xml
index f36e4bb01..bc19baf02 100644
--- a/controlloop/templates/pom.xml
+++ b/controlloop/templates/pom.xml
@@ -34,7 +34,6 @@
 
     <modules>
     	<module>template.demo</module>
-    	<module>template.demo.v1.0.0</module>
     	<module>archetype-cl-amsterdam</module>
     </modules>
 
diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/pom.xml
index fdf74293e..d79080403 100644
--- a/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/pom.xml
+++ b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/pom.xml
@@ -70,7 +70,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>mso</artifactId>
+			<artifactId>so</artifactId>
 			<version>${dependenciesVersion}</version>
 		</dependency>
 		<dependency>
diff --git a/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml b/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml
index ff344473c..c3c5c746d 100644
--- a/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml
+++ b/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml
@@ -75,7 +75,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>mso</artifactId>
+			<artifactId>so</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
-- 
cgit 1.2.3-korg