Cleanup SQL output feature-state-mgt

use an in-memory database and not store temp files in
the development directory.

Upgrading to H2 1.4.200 seemed to expose the database
issues. mvn clean does NOT remove the sql directory
which makes it hard to figure out what is going on.

Issue-ID: POLICY-2381
Change-Id: Icab5d9b6f62ed0f9c4e5be91c2b518ab2b442167
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/.gitignore b/.gitignore
index 8b15fc5..123c6e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
 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 8612506..1a34e65 100644 (file)
--- 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:file:./sql/statemanagement");
+        cleanProperties.put(StateManagementProperties.DB_URL, "jdbc:h2:mem: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 24dabe1..25f5e8f 100644 (file)
--- 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="./sql/generatedCreateStateManagement.ddl" />
+                value="target/classes/META-INF/generatedCreateStateManagement.ddl" />
             <property
                 name="javax.persistence.schema-generation.scripts.drop-target"
-                value="./sql/generatedDropStateManagement.ddl" />
+                value="target/classes/META-INF/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 56d18b5..b1ff12e 100644 (file)
--- 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:file:./sql/statemanagement
+javax.persistence.jdbc.url  = jdbc:h2:mem: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:file:./sql/statemanagement
+repository.audit.url=jdbc:h2:mem:statemanagement
 repository.audit.username=sa
 repository.audit.password=