Fixed obsolete http url

master
Giancarlo Panichi 2 years ago
parent 6a8cb56a75
commit 8a762d0717

@ -23,10 +23,6 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

@ -1,18 +1,16 @@
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
# Changelog for "ecological-engine-smart-executor"
## [v1.6.6] - 2021-10-06
## [v1.6.7-SNAPSHOT] - 2022-04-05
### Fixes
- Fixed obsolete http link
- Fixed obsolete short urls [#20971]
## [v1.6.6] - 2021-10-06
- Fixed obsolete short urls [#20971]
## [v1.6.5] - 2021-01-20
### Features
## [v1.6.5] - 2021-01-20
- added commons-io-2.6 dependency
- update ecological-engine lower bound range
@ -20,57 +18,38 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.6.4] - 2020-10-15
### Features
- Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790]
## [v1.6.3] - 2020-06-10
### Features
- Updated for support https protocol [#19423]
## [v1.6.0] - 2017-09-27
### Features
- Moved to the new SocialNetowrkingService 2.0
## [v1.4.0] - 2016-09-27
### Features
- Moved generic Worker to Dataminer
## [v1.3.0] - 2016-04-01
### Features
- Web application publisher
## [v1.2.0] - 2016-02-08
### Features
- Management of SAI algorithm
## [v1.0.0] - 2015-05-27
### Features
- First Release
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

@ -1,5 +1,10 @@
<ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
<Changeset
component="org.gcube.data-analysis.ecological-engine-smart-executor.1-6-7"
date="2022-04-05">
<Change>Fixed obsolete short urls [#20971]</Change>
</Changeset>
<Changeset
component="org.gcube.data-analysis.ecological-engine-smart-executor.1-6-6"
date="2021-05-31">

@ -9,7 +9,7 @@
</parent>
<groupId>org.gcube.dataanalysis</groupId>
<artifactId>ecological-engine-smart-executor</artifactId>
<version>1.6.6</version>
<version>1.6.7-SNAPSHOT</version>
<name>ecological-engine-smart-executor</name>
<description>Smart Ecological Engine Executor library</description>
@ -24,7 +24,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>2.0.0</version>
<version>2.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -103,7 +103,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>

@ -53,7 +53,7 @@ public class StorageUtils {
out.close();
}
public static String uploadFilesOnStorage(String scope, String user, String localFolder, String remoteFolder, String file, boolean httplink) throws Exception {
public static String uploadFilesOnStorage(String scope, String user, String localFolder, String remoteFolder, String file, boolean httpslink) throws Exception {
try {
// ScopeProvider.instance.set(scope);
AnalysisLogger.getLogger().info("Loading file on scope: " + scope);
@ -61,8 +61,8 @@ public class StorageUtils {
String remotef = remoteFolder+file.replace(" ","%20");
client.put(true).LFile(new File(localFolder,file).getAbsolutePath()).RFile(remotef);
String url = "";
if (httplink)
url = client.getHttpUrl().RFile(remotef);
if (httpslink)
url = client.getHttpsUrl().RFile(remotef);
else
url = client.getUrl().RFile(remotef);
try{client.close();}catch(Exception e){}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save