summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-02-26 04:34:41 +0000
committerPamela Dragosh <pdragosh@research.att.com>2020-02-26 04:34:41 +0000
commit46523eee161e53f7aaf0e52978aa8834b6df82c5 (patch)
tree2467a751fe88ea89035e6d73cbf42a8d423df7fe
parent4de095c769c28f3f304d99f132a845993bf58dfa (diff)
Revert "Cleanup SQL output feature-state-mgt"
This reverts commit 4de095c769c28f3f304d99f132a845993bf58dfa. Reason for revert: Failing to merge Issue-ID: POLICY-2381 Change-Id: Icbb4d75a3876a44f8207fa84410c4d565da34f98 signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--.gitignore1
-rw-r--r--feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java2
-rw-r--r--feature-state-management/src/test/resources/META-INF/persistence.xml4
-rw-r--r--feature-state-management/src/test/resources/feature-state-management.properties4
4 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 123c6e21..8b15fc55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
target/
*/config/
*/logs/
+*/sql/
*/testingLogs/
**/*.iml
.checkstyle
diff --git a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
index 1a34e65a..86125069 100644
--- a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
+++ b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
@@ -239,7 +239,7 @@ public class StateManagementTest {
Properties cleanProperties = new Properties();
cleanProperties.put(StateManagementProperties.DB_DRIVER,"org.h2.Driver");
- cleanProperties.put(StateManagementProperties.DB_URL, "jdbc:h2:mem:statemanagement");
+ cleanProperties.put(StateManagementProperties.DB_URL, "jdbc:h2:file:./sql/statemanagement");
cleanProperties.put(StateManagementProperties.DB_USER, "sa");
cleanProperties.put(StateManagementProperties.DB_PWD, "");
diff --git a/feature-state-management/src/test/resources/META-INF/persistence.xml b/feature-state-management/src/test/resources/META-INF/persistence.xml
index 25f5e8f3..24dabe1d 100644
--- a/feature-state-management/src/test/resources/META-INF/persistence.xml
+++ b/feature-state-management/src/test/resources/META-INF/persistence.xml
@@ -40,10 +40,10 @@
value="drop-and-create" />
<property
name="javax.persistence.schema-generation.scripts.create-target"
- value="target/classes/META-INF/generatedCreateStateManagement.ddl" />
+ value="./sql/generatedCreateStateManagement.ddl" />
<property
name="javax.persistence.schema-generation.scripts.drop-target"
- value="target/classes/META-INF/generatedDropStateManagement.ddl" />
+ value="./sql/generatedDropStateManagement.ddl" />
</properties>
</persistence-unit>
diff --git a/feature-state-management/src/test/resources/feature-state-management.properties b/feature-state-management/src/test/resources/feature-state-management.properties
index b1ff12ea..56d18b54 100644
--- a/feature-state-management/src/test/resources/feature-state-management.properties
+++ b/feature-state-management/src/test/resources/feature-state-management.properties
@@ -20,7 +20,7 @@
# DB properties
javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url = jdbc:h2:mem:statemanagement
+javax.persistence.jdbc.url = jdbc:h2:file:./sql/statemanagement
javax.persistence.jdbc.user = sa
javax.persistence.jdbc.password =
@@ -77,7 +77,7 @@ repository.audit.ignore.errors=true
# Timeout in seconds
repository.audit.timeout=5
repository.audit.id=statemanagement
-repository.audit.url=jdbc:h2:mem:statemanagement
+repository.audit.url=jdbc:h2:file:./sql/statemanagement
repository.audit.username=sa
repository.audit.password=