From dde8b8074ff025d1ba3e68834d7cfefacfe2e60f Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 3 May 2019 10:21:28 +0000
Subject: [PATCH] Bug fixing the issue at
 https://support.d4science.org/issues/16580#note-6

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@179237 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  3 --
 .../GCubeCkanDataCatalog.gwt.xml              |  4 +++
 .../GCubeCkanDataCatalog.gwt.xml              |  4 +++
 .../jsp/GCubeCkanDataCatalogPortlet_view.jsp  | 30 ++++++++++++++++---
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index daf01d3..e22767e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,9 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="grsf-manage-widget-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-manage-widget-TRUNK/grsf-manage-widget-TRUNK">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="gcube-ckan-datacatalog"/>
         <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
index 627d610..800e31e 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
@@ -14,6 +14,10 @@
 	<!-- Other module inherits -->
 	<inherits name="com.google.gwt.json.JSON" />
 	<!-- Inherits widget -->
+	
+	<inherits
+		name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
+		
 	<inherits
 		name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' />
 	<inherits
diff --git a/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml b/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
index 627d610..800e31e 100644
--- a/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
@@ -14,6 +14,10 @@
 	<!-- Other module inherits -->
 	<inherits name="com.google.gwt.json.JSON" />
 	<!-- Inherits widget -->
+	
+	<inherits
+		name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
+		
 	<inherits
 		name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' />
 	<inherits
diff --git a/src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp b/src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp
index 3c2a7a4..bc03c11 100644
--- a/src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp
+++ b/src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp
@@ -7,8 +7,30 @@
 
 <portlet:defineObjects />
 --%>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/GCubeCkanDataCatalog.css" type="text/css">
-<script type="text/javascript" src="<%=request.getContextPath()%>/gCubeCkanDataCatalog/gCubeCkanDataCatalog.nocache.js"></script>
-<script type="text/javascript" src='<%=request.getContextPath()%>/js/jquery.min.js'></script>	
-<script type="text/javascript" src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script>
+<script
+	src='<%=request.getContextPath()%>/gCubeCkanDataCatalog/js/jquery-1.10.1.min.js'></script>
+
+<script
+	src='<%=request.getContextPath()%>/gCubeCkanDataCatalog/js/bootstrap.min.js'></script>
+
+<link rel="stylesheet"
+	href="<%=request.getContextPath()%>/GCubeCkanDataCatalog.css"
+	type="text/css">
+
+<link type="text/css" rel="stylesheet"
+	href="<%=request.getContextPath()%>/gCubeCkanDataCatalog/css/ol.css">
+
+<script type="text/javascript"
+	src="<%=request.getContextPath()%>/gCubeCkanDataCatalog/js/ol.js"></script>
+
+<script type="text/javascript"
+	src="<%=request.getContextPath()%>/gCubeCkanDataCatalog/gCubeCkanDataCatalog.nocache.js"></script>
+
+<script type="text/javascript"
+	src='<%=request.getContextPath()%>/js/jquery.min.js'></script>
+	
+<script type="text/javascript"
+	src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script>
+
+
 <div id="gCubeCkanDataCatalog"></div>
\ No newline at end of file