Merge pull request #570 from pdowler/master

cadc-storage-adapter-ad fix
opencadc · Apr 8, 2024 · e1de218 · e1de218
2 parents 5f94cb2 + d3d5e12
commit e1de218
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/cadc-storage-adapter-ad/build.gradle b/cadc-storage-adapter-ad/build.gradle
@@ -14,7 +14,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '0.6.5'
+version = '0.7.0'
 
 description = 'OpenCADC Storage Inventory AdStorageAdapter implementation'
 def git_url = 'https://github.com/opencadc/storage-inventory'
@@ -24,10 +24,10 @@ dependencies {
     compile 'org.opencadc:cadc-cdp:[1.3,2.0)'
     compile 'org.opencadc:cadc-dali:[1.2.1,)'
     compile 'org.opencadc:cadc-tap:[1.1.12,)'
-    compile 'org.opencadc:cadc-inventory:[0.9.3,)'
-    compile 'org.opencadc:cadc-storage-adapter:[0.11.2,)'
+    compile 'org.opencadc:cadc-inventory:[1.0,)'
+    compile 'org.opencadc:cadc-storage-adapter:[1.0,)'
     compile 'org.opencadc:cadc-registry:[1.0,)'
-    compile 'org.opencadc:cadc-vos:[1.2,2.0)'
+    compile 'org.opencadc:cadc-vos:[2.0,3.0)'
 
     testCompile 'junit:junit:[4.0,)'
 }

diff --git a/...-storage-adapter-ad/src/main/java/org/opencadc/inventory/storage/ad/AdStorageAdapter.java b/...-storage-adapter-ad/src/main/java/org/opencadc/inventory/storage/ad/AdStorageAdapter.java
@@ -93,13 +93,6 @@
 import ca.nrc.cadc.reg.Standards;
 import ca.nrc.cadc.reg.client.RegistryClient;
 import ca.nrc.cadc.util.StringUtil;
-import ca.nrc.cadc.vos.Direction;
-import ca.nrc.cadc.vos.Protocol;
-import ca.nrc.cadc.vos.Transfer;
-import ca.nrc.cadc.vos.TransferParsingException;
-import ca.nrc.cadc.vos.TransferReader;
-import ca.nrc.cadc.vos.TransferWriter;
-import ca.nrc.cadc.vos.VOS;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -111,7 +104,6 @@
 import java.security.AccessControlException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -128,6 +120,13 @@
 import org.opencadc.inventory.storage.StorageEngageException;
 import org.opencadc.inventory.storage.StorageMetadata;
 import org.opencadc.tap.TapClient;
+import org.opencadc.vospace.VOS;
+import org.opencadc.vospace.transfer.Direction;
+import org.opencadc.vospace.transfer.Protocol;
+import org.opencadc.vospace.transfer.Transfer;
+import org.opencadc.vospace.transfer.TransferParsingException;
+import org.opencadc.vospace.transfer.TransferReader;
+import org.opencadc.vospace.transfer.TransferWriter;
 
 /**
  * The interface to storage implementations.

diff --git a/minoc/VERSION b/minoc/VERSION
@@ -4,6 +4,6 @@
 # tags with and without build number so operators use the versioned
 # tag but we always keep a timestamped tag in case a semantic tag gets
 # replaced accidentally
-VER=1.0.0
+VER=1.0.1
 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/minoc/build.gradle b/minoc/build.gradle
@@ -52,7 +52,7 @@ dependencies {
 
     runtime 'org.opencadc:cadc-access-control-identity:[1.2.1,2.0)'
     runtime 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)'
-    runtime 'org.opencadc:cadc-storage-adapter-ad:[0.6.2,)'
+    runtime 'org.opencadc:cadc-storage-adapter-ad:[0.7.0,)'
     runtime 'org.opencadc:cadc-storage-adapter-swift:[0.8.7,)'
 }
 

diff --git a/minoc/src/main/java/org/opencadc/minoc/MinocConfig.java b/minoc/src/main/java/org/opencadc/minoc/MinocConfig.java
@@ -414,9 +414,6 @@ public List<Namespace> getRecoverableNamespaces() {
     public StorageAdapter getStorageAdapter() {
         String cname = configProperties.getFirstPropertyValue(MinocConfig.SA_KEY);
         StorageAdapter storageAdapter = InventoryUtil.loadPlugin(cname);
-        for (Namespace ns : recoverableNamespaces) {
-            log.info("initStorageAdapter: recoverableNamespace  = " + ns.getNamespace());
-        }
         storageAdapter.setRecoverableNamespaces(recoverableNamespaces);
         return storageAdapter;
     }
@@ -430,8 +427,6 @@ public Map<String,Object> getDaoConfig() {
             ret.put("jndiDataSourceName", JNDI_DATASOURCE);
             ret.put("invSchema", configProperties.getFirstPropertyValue(SCHEMA_KEY));
             ret.put("genSchema", configProperties.getFirstPropertyValue(SCHEMA_KEY));
-            //config.put("vosSchema", null);
-            //config.put("database", null);
             return ret;
         } catch (ClassNotFoundException ex) {
             throw new IllegalStateException("invalid config: failed to load SQLGenerator: " + cname);

diff --git a/minoc/src/main/java/org/opencadc/minoc/MinocInitAction.java b/minoc/src/main/java/org/opencadc/minoc/MinocInitAction.java
@@ -110,10 +110,14 @@ public MinocInitAction() {
 
     @Override
     public void doInit() {
-        initConfig();
-        initDatabase();
-        initStorageSite();
-        initStorageAdapter();
+        try {
+            initConfig();
+            initDatabase();
+            initStorageSite();
+            initStorageAdapter();
+        } catch (Throwable ex) {
+            log.error("init fail", ex);
+        }
     }
 
     @Override