Support for recursive node deletes (CADC-12558)

README.md

@@ -46,6 +46,10 @@ local artifact selection policy. This is used if the new fenwick policy excludes
 This is an implementation of the **file-validate** process that compares the inventory database against 
 the back end storage at a storage site.
 
+## vault
+UNDER DEVELOPMENT: This is an implementation of an <a href="https://www.ivoa.net/documents/TAP/">IVOA VOSpace</a> 
+service that uses storage-inventory as the back end storage mechanism.
+
 ## cadc-*
 These are libraries used in multiple services and applications.
 

cadc-inventory-db/build.gradle

@@ -17,7 +17,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '0.14.6'
+version = '0.15.0'
 
 description = 'OpenCADC Storage Inventory database library'
 def git_url = 'https://github.com/opencadc/storage-inventory'
@@ -26,7 +26,9 @@ mainClassName = 'org.opencadc.inventory.db.version.Main'
 
 dependencies {
     compile 'org.opencadc:cadc-util:[1.9.5,2.0)'
+    compile 'org.opencadc:cadc-gms:[1.0.0,)'
     compile 'org.opencadc:cadc-inventory:[0.9.4,)'
+    compile 'org.opencadc:cadc-vos:[2.0,3.0)'
 
     testCompile 'junit:junit:[4.0,)'
 

cadc-inventory-db/src/intTest/java/org/opencadc/inventory/db/TestUtil.java

@@ -79,10 +79,11 @@
 public class TestUtil {
     private static final Logger log = Logger.getLogger(TestUtil.class);
 
-    static String SERVER = "INVENTORY_TEST";
-    static String DATABASE = "cadctest";
-    static String SCHEMA = "inventory";
-    static String TABLE_PREFIX = null;
+    public static String SERVER = "INVENTORY_TEST";
+    public static String DATABASE = "cadctest";
+    public static String SCHEMA = "inventory";
+    public static String VOS_SCHEMA = "vospace";
+    public static String TABLE_PREFIX = null;
 
     static {
         try {
@@ -102,12 +103,17 @@ public class TestUtil {
                 if (s != null) {
                     SCHEMA = s.trim();
                 }
+                s = props.getProperty("vos_schema");
+                if (s != null) {
+                    VOS_SCHEMA = s.trim();
+                }
                 s = props.getProperty("tablePrefix");
                 if (s != null) {
                     TABLE_PREFIX = s.trim();
                 }
             }
-            log.info("intTest database config: " + SERVER + " " + DATABASE + " " + SCHEMA + " " + TABLE_PREFIX);
+            log.info("intTest database config: " + SERVER + " " + DATABASE + " " + SCHEMA + " " + VOS_SCHEMA
+                + " tablePrefix=" + TABLE_PREFIX);
         } catch (Exception oops) {
             log.debug("failed to load/read optional db config", oops);
         }