caching back derbydb and adding a prop to reset dml cache marker

Author: rmannibucau

derbydb.zip

@@ -163,6 +163,10 @@ processOptions() {
                 appendArgs "-Djaxrs=true"
                 ;;
 
+            --reset-persistence)
+                appendArgs "-Dreset.persistence=true"
+                ;;
+
             --interop)
                 appendArgs "-Dinterop=true"
                 ;;
@@ -250,8 +254,8 @@ case "$web" in
 esac
 
 rm -fr derbydb
-#unzip -q derbydb.zip
-#sql=skip
+unzip -q derbydb.zip
+sql=skip
 
 # Append options if any
 if [ "x$options" != "x" ]; then

runtests

@@ -353,7 +353,9 @@ class SetupCommand
         //
         // Process the dml for derby just once if it hasn't already been done
         def dmlProcessedFile = new File("${javaeeCtsHome}/dml_processed")
-        dmlProcessedFile.delete() // force regeneration for now
+        if (get("reset.persistence").equals('true')) {
+            dmlProcessedFile.delete()
+        }
         if (!dmlProcessedFile.exists()) {
             log.info("Processing DML for Derby")