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>
diff --git a/controlloop/packages/artifacts/pom.xml b/controlloop/packages/artifacts/pom.xml
index f47f2b7..486c55c 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 34684ae..1ca906f 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 @@
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