Merge pull request #562 from pdowler/vos2

moved ArtifactSyncWorker to vospace pkg
opencadc · Mar 18, 2024 · 1853e77 · 1853e77
2 parents 742bc6b + 5f374cc
commit 1853e77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.../org/opencadc/ArtifactSyncWorkerTest.java → ...dc/vospace/db/ArtifactSyncWorkerTest.java b/.../org/opencadc/ArtifactSyncWorkerTest.java → ...dc/vospace/db/ArtifactSyncWorkerTest.java
@@ -65,7 +65,7 @@
 ************************************************************************
 */
 
-package org.opencadc;
+package org.opencadc.vospace.db;
 
 import ca.nrc.cadc.db.ConnectionConfig;
 import ca.nrc.cadc.db.DBConfig;
@@ -84,7 +84,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.opencadc.inventory.Artifact;
-import org.opencadc.inventory.ArtifactSyncWorker;
+import org.opencadc.vospace.db.ArtifactSyncWorker;
 import org.opencadc.inventory.Namespace;
 import org.opencadc.inventory.db.ArtifactDAO;
 import org.opencadc.inventory.db.HarvestState;

diff --git a/...pencadc/inventory/ArtifactSyncWorker.java → ...encadc/vospace/db/ArtifactSyncWorker.java b/...pencadc/inventory/ArtifactSyncWorker.java → ...encadc/vospace/db/ArtifactSyncWorker.java
@@ -65,12 +65,14 @@
 ************************************************************************
  */
 
-package org.opencadc.inventory;
+package org.opencadc.vospace.db;
 
 import ca.nrc.cadc.db.TransactionManager;
 import ca.nrc.cadc.io.ResourceIterator;
 import java.io.IOException;
 import org.apache.log4j.Logger;
+import org.opencadc.inventory.Artifact;
+import org.opencadc.inventory.Namespace;
 import org.opencadc.inventory.db.ArtifactDAO;
 import org.opencadc.inventory.db.HarvestState;
 import org.opencadc.inventory.db.HarvestStateDAO;

diff --git a/cadc-inventory-db/src/main/resources/vospace.Node.sql b/cadc-inventory-db/src/main/resources/vospace.Node.sql
@@ -8,10 +8,10 @@ create table <schema>.Node (
     ownerID varchar(256) not null,
     isPublic boolean,
     isLocked boolean,
-    readOnlyGroups text,
-    readWriteGroups text,
+    readOnlyGroups text[],
+    readWriteGroups text[],
 
-    -- store all props in a 2D array
+    -- store misc props in a 2D array
     properties text[][],
 
     -- ContainerNode