diff --git a/cadc-inventory-db/src/intTest/java/org/opencadc/ArtifactSyncWorkerTest.java b/cadc-inventory-db/src/intTest/java/org/opencadc/vospace/db/ArtifactSyncWorkerTest.java similarity index 99% rename from cadc-inventory-db/src/intTest/java/org/opencadc/ArtifactSyncWorkerTest.java rename to cadc-inventory-db/src/intTest/java/org/opencadc/vospace/db/ArtifactSyncWorkerTest.java index 608430db..fa18912c 100644 --- a/cadc-inventory-db/src/intTest/java/org/opencadc/ArtifactSyncWorkerTest.java +++ b/cadc-inventory-db/src/intTest/java/org/opencadc/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/cadc-inventory-db/src/main/java/org/opencadc/inventory/ArtifactSyncWorker.java b/cadc-inventory-db/src/main/java/org/opencadc/vospace/db/ArtifactSyncWorker.java similarity index 98% rename from cadc-inventory-db/src/main/java/org/opencadc/inventory/ArtifactSyncWorker.java rename to cadc-inventory-db/src/main/java/org/opencadc/vospace/db/ArtifactSyncWorker.java index 7452eca6..29e80384 100644 --- a/cadc-inventory-db/src/main/java/org/opencadc/inventory/ArtifactSyncWorker.java +++ b/cadc-inventory-db/src/main/java/org/opencadc/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 index 3e23b5b2..51e5d646 100644 --- 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 .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