diff --git a/cadc-sia/build.gradle b/cadc-sia/build.gradle index d3594046..a855ebbd 100644 --- a/cadc-sia/build.gradle +++ b/cadc-sia/build.gradle @@ -15,17 +15,15 @@ sourceCompatibility = 11 group = 'org.opencadc' -version = '1.1.15' +version = '1.1.16' description = 'OpenCADC SIA server library' def git_url = 'https://github.com/opencadc/dal' dependencies { - implementation 'org.jdom:jdom2:[2.0,)' - api 'org.opencadc:cadc-dali:[1.2.4,)' implementation 'org.opencadc:cadc-registry:[1.5.0,)' - implementation 'org.opencadc:cadc-util:[1.6,)' + api 'org.opencadc:cadc-util:[1.6,)' api 'org.opencadc:cadc-rest:[1.4.5,)' api 'org.opencadc:cadc-uws:[1.0,)' api 'org.opencadc:cadc-uws-server:[1.2,)' diff --git a/cadc-sia/src/main/java/ca/nrc/cadc/sia2/impl/ServiceAvailability.java b/cadc-sia/src/main/java/ca/nrc/cadc/sia2/impl/ServiceAvailability.java index ed1eade0..79a37a4d 100644 --- a/cadc-sia/src/main/java/ca/nrc/cadc/sia2/impl/ServiceAvailability.java +++ b/cadc-sia/src/main/java/ca/nrc/cadc/sia2/impl/ServiceAvailability.java @@ -75,6 +75,8 @@ import ca.nrc.cadc.reg.client.RegistryClient; import ca.nrc.cadc.sia2.SiaRunner; import ca.nrc.cadc.util.FileUtil; +import ca.nrc.cadc.util.InvalidConfigException; +import ca.nrc.cadc.util.MultiValuedProperties; import ca.nrc.cadc.util.PropertiesReader; import ca.nrc.cadc.vosi.Availability; import ca.nrc.cadc.vosi.AvailabilityPlugin; @@ -94,7 +96,7 @@ public class ServiceAvailability implements AvailabilityPlugin { private static final Logger log = Logger.getLogger(ServiceAvailability.class); - private static final String CONFIG_FILE_NAME = SiaRunner.class.getSimpleName() + ".properties"; + private static final String CONFIG_FILE_NAME = "sia.properties"; private static final String CONFIG_TAP_URI_KEY = "tapURI"; private String applicationName; @@ -190,16 +192,13 @@ public static String getTapURI() { } private static String getTapURIProperty() throws IOException { - // Try to get from a file on disk first. final PropertiesReader propertiesReader = new PropertiesReader(CONFIG_FILE_NAME); - - if (propertiesReader.canRead()) { - return propertiesReader.getFirstPropertyValue(CONFIG_TAP_URI_KEY); - } else { - URL url = FileUtil.getURLFromResource(CONFIG_FILE_NAME, ServiceAvailability.class); - Properties props = new Properties(); - props.load(url.openStream()); - return props.getProperty(CONFIG_TAP_URI_KEY); - } + MultiValuedProperties mvp = propertiesReader.getAllProperties(); + String ret = mvp.getFirstPropertyValue(CONFIG_TAP_URI_KEY); + log.warn("found tapURI: " + ret); + if (ret != null) { + return ret; + } + throw new InvalidConfigException("not found/readable: " + CONFIG_FILE_NAME); } }