diff --git a/caom2-pkg-server/build.gradle b/caom2-pkg-server/build.gradle index 9e8ed9e..48a2c3e 100644 --- a/caom2-pkg-server/build.gradle +++ b/caom2-pkg-server/build.gradle @@ -13,7 +13,7 @@ sourceCompatibility = 1.8 group = 'org.opencadc' -version = '1.8.2' +version = '1.8.3' description = 'OpenCADC CAOM2 package server library' def git_url = 'https://github.com/opencadc/caom2service' diff --git a/caom2-pkg-server/src/main/java/ca/nrc/cadc/caom2/pkg/CaomPackageRunner.java b/caom2-pkg-server/src/main/java/ca/nrc/cadc/caom2/pkg/CaomPackageRunner.java index fdebca4..26115c2 100644 --- a/caom2-pkg-server/src/main/java/ca/nrc/cadc/caom2/pkg/CaomPackageRunner.java +++ b/caom2-pkg-server/src/main/java/ca/nrc/cadc/caom2/pkg/CaomPackageRunner.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2021. (c) 2021. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 @@ -69,10 +69,6 @@ package ca.nrc.cadc.caom2.pkg; -import java.security.AccessControlException; -import org.opencadc.pkg.server.PackageItem; -import org.opencadc.pkg.server.PackageRunner; - import ca.nrc.cadc.auth.AuthMethod; import ca.nrc.cadc.auth.AuthenticationUtil; import ca.nrc.cadc.caom2.Artifact; @@ -87,19 +83,20 @@ import ca.nrc.cadc.uws.ParameterUtil; import java.io.IOException; import java.net.URI; -import java.net.URL; import java.net.URISyntaxException; +import java.net.URL; import java.security.AccessControlContext; +import java.security.AccessControlException; import java.security.AccessController; import java.security.cert.CertificateException; import java.util.ArrayList; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.ListIterator; - import javax.security.auth.Subject; import org.apache.log4j.Logger; +import org.opencadc.pkg.server.PackageItem; +import org.opencadc.pkg.server.PackageRunner; public class CaomPackageRunner extends PackageRunner { @@ -205,7 +202,7 @@ public Iterator getItems() throws IOException { log.debug("new PackageItem: " + a.getURI() + " from " + url); log.debug("package entry filename " + artifactName); - PackageItem newItem = new PackageItem(url, artifactName); + PackageItem newItem = new PackageItem(artifactName, url); packageItems.add(newItem); } }