[#20735] Migrated to catalogue-util-library
This commit is contained in:
parent
ddac8e5aff
commit
e6456e4f89
|
|
@ -0,0 +1,24 @@
|
|||
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [v1.2.0-SNAPSHOT] - 2021-02-17
|
||||
|
||||
[#20735] Bug fixes
|
||||
|
||||
|
||||
## [v1.1.0] - 2019-12-05
|
||||
|
||||
Bug fixes
|
||||
|
||||
|
||||
## [v1.0.1] - 2017-05-10
|
||||
|
||||
Bug fixes
|
||||
|
||||
|
||||
## [v1.0.0] - 2017-05-01
|
||||
|
||||
First release
|
||||
22
pom.xml
22
pom.xml
|
|
@ -13,27 +13,27 @@
|
|||
|
||||
<groupId>org.gcube.portlets-widgets</groupId>
|
||||
<artifactId>catalogue-sharing-widget</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<name>catalogue-sharing-widget</name>
|
||||
|
||||
|
||||
<description>
|
||||
gCube catalogue sharing widget allows to share catalogue's items urls through social facilities.
|
||||
</description>
|
||||
|
||||
|
||||
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
|
||||
|
||||
<properties>
|
||||
<!-- Convenience property to set the GWT version -->
|
||||
<gwtVersion>2.7.0</gwtVersion>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<!-- <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory> -->
|
||||
<!-- <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory> -->
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
|
|
@ -112,10 +112,10 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.data-catalogue</groupId>
|
||||
<artifactId>ckan-util-library</artifactId>
|
||||
<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.gcube.datacatalogue</groupId>
|
||||
<artifactId>catalogue-util-library</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
|
|
@ -142,7 +142,7 @@
|
|||
|
||||
<build>
|
||||
<!-- Generate compiled stuff in the folder used for developing mode -->
|
||||
<!-- <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory> -->
|
||||
<!-- <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory> -->
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<!-- Responsive design -->
|
||||
<set-property name="bootstrap.responsiveDesign" value="true" />
|
||||
<inherits name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' />
|
||||
<inherits name='org.gcube.datacatalogue.utillibrary.CkanUtilLibrary' />
|
||||
|
||||
<!-- Other module inherits -->
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import javax.servlet.http.HttpSession;
|
|||
|
||||
import org.gcube.common.portal.PortalContext;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.ApplicationProfileScopePerUrlReader;
|
||||
import org.gcube.datacatalogue.utillibrary.server.ApplicationProfileScopePerUrlReader;
|
||||
|
||||
import com.liferay.portal.kernel.log.Log;
|
||||
import com.liferay.portal.kernel.log.LogFactoryUtil;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
package org.gcube.portlets_widgets.catalogue_sharing_widget.server;
|
||||
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue;
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueFactory;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogue;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogueFactory;
|
||||
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
|
||||
import org.gcube.portlets.user.urlshortener.UrlShortener;
|
||||
import org.gcube.portlets_widgets.catalogue_sharing_widget.client.ShareServices;
|
||||
import org.gcube.portlets_widgets.catalogue_sharing_widget.shared.ItemUrls;
|
||||
|
|
@ -10,8 +11,6 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
|
|||
import com.liferay.portal.kernel.log.Log;
|
||||
import com.liferay.portal.kernel.log.LogFactoryUtil;
|
||||
|
||||
import eu.trentorise.opendata.jackan.model.CkanDataset;
|
||||
|
||||
public class ShareServicesImpl extends RemoteServiceServlet implements ShareServices{
|
||||
|
||||
private static final long serialVersionUID = -2060855544534802987L;
|
||||
|
|
@ -38,7 +37,7 @@ public class ShareServicesImpl extends RemoteServiceServlet implements ShareServ
|
|||
String scopePerCurrentUrl = ServerUtils.getScopeFromClientUrl(getThreadLocalRequest());
|
||||
logger.debug("The scope per current URL is: " + scopePerCurrentUrl);
|
||||
DataCatalogue catalogue = getCatalogue(scopePerCurrentUrl);
|
||||
CkanDataset dataset = catalogue.getDataset(uuid, catalogue.getApiKeyFromUsername(ServerUtils.getUserInSession(getThreadLocalRequest())));
|
||||
CkanDataset dataset = catalogue.getDataset(uuid, ServerUtils.getUserInSession(getThreadLocalRequest()));
|
||||
String longUrl = catalogue.getUnencryptedUrlFromDatasetIdOrName(uuid);
|
||||
|
||||
if(longUrl == null || longUrl.isEmpty())
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<!-- Responsive design -->
|
||||
<set-property name="bootstrap.responsiveDesign" value="true" />
|
||||
<inherits name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' />
|
||||
<inherits name='org.gcube.datacatalogue.utillibrary.CkanUtilLibrary' />
|
||||
|
||||
<!-- Other module inherits -->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue