Compare commits

...

4 Commits

Author SHA1 Message Date
Fabio Sinibaldi f031d68224 JDK 11 compliance 2023-01-19 18:05:32 +01:00
Fabio Sinibaldi 13f9b12366 Merge pull request '20760_https' (#6) from 20760_https into master
Reviewed-on: #6
2023-01-19 17:48:34 +01:00
Fabio Sinibaldi 7bd61985f7 Release 1.3.1 2023-01-19 17:47:19 +01:00
Fabio Sinibaldi f4096a3e97 Fixes #20760 2022-05-05 16:04:54 +02:00
4 changed files with 18 additions and 13 deletions

View File

@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data.transfer.sis-geotk-plugin
## [v1.3.1] 2021-03-25
Fixes [#20760](https://support.d4science.org/issues/20760) https endpoints
## [v1.3.0] 2021-03-25
Use of EPSG Dataset
Proxy support

13
pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>sis-geotk-plugin</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<name>Sis/GeoToolkit plugin</name>
<description>Apache Sis/Geotk plugin for data-transfer-service</description>
@ -32,14 +32,14 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId>
<version>2.1.0</version>
<version>2.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -165,10 +165,15 @@
<dependency>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-library</artifactId>
<version>[1.2.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
<version>[1.2.0,2.0.0-SNAPSHOT)</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>org.opengis</groupId>
<artifactId>geoapi-conformance</artifactId>

View File

@ -132,7 +132,7 @@ public class ThreddsInstanceManager {
info.setHostname(currentHostname);
info.setGhnId(currentGHNId);
info.setLocalBasePath(threddsPersistenceLocation);
info.setInstanceBaseUrl("http://"+info.getHostname()+"/thredds");
info.setInstanceBaseUrl("https://"+info.getHostname()+"/thredds");
String mainCatalogPath=threddsContentRoot+"/catalog.xml";

View File

@ -20,23 +20,19 @@ import org.gcube.data.transfer.model.Destination;
import org.gcube.data.transfer.model.DestinationClashPolicy;
import org.gcube.data.transfer.model.PluginInvocation;
import org.gcube.data.transfer.plugins.thredds.sis.SISPluginFactory;
import org.gcube.smartgears.Constants;
import org.gcube.spatial.data.clients.model.engine.Engine;
import org.gcube.spatial.data.sdi.interfaces.Metadata;
import org.gcube.spatial.data.sdi.model.faults.RemoteException;
import org.gcube.spatial.data.sdi.plugins.SDIAbstractPlugin;
public class PublishTest {
public static void main(String[] args) throws MalformedURLException, RemoteException, InvalidSourceException, SourceNotSetException, FailedTransferException, InitializationException, InvalidDestinationException, DestinationNotSetException {
public static void main(String[] args) throws MalformedURLException, Exception, InvalidSourceException, SourceNotSetException, FailedTransferException, InitializationException, InvalidDestinationException, DestinationNotSetException {
TokenSetter.set("/pred4s/preprod/preVRE");
String hostname=
new URL(SDIAbstractPlugin.management().build().getConfiguration().getByEngine(Engine.TH_ENGINE).get(0).getBaseEndpoint()).getHost();
String hostname="";
// Not yet released sdi refactoring
// new URL(SDIAbstractPlugin.management().build().getConfiguration().getByEngine(Engine.TH_ENGINE).get(0).getBaseEndpoint()).getHost();
DataTransferClient client=DataTransferClient.getInstanceByEndpoint("https://"+hostname);