From 4b54dc0f5b4acc8acedf9a6df663b8cda06ba7ab Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 12 Oct 2020 13:21:57 +0200
Subject: [PATCH] fixed Gateway class omonimy in jsp issue

---
 pom.xml                               | 2 +-
 src/main/webapp/html/init.jsp         | 6 +-----
 src/main/webapp/html/vreyard/view.jsp | 5 +++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7acab57..654616f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<artifactId>thematic-gateways-portlet</artifactId>
 	<packaging>war</packaging>
 	<name>thematic-gateways-portlet Portlets</name>
-	<version>7.1.0</version>
+	<version>7.1.0-SNAPSHOT</version>
 	<description>
 		Thematic Gateways Portlet
 		</description>
diff --git a/src/main/webapp/html/init.jsp b/src/main/webapp/html/init.jsp
index 350cc70..2cb8ac4 100644
--- a/src/main/webapp/html/init.jsp
+++ b/src/main/webapp/html/init.jsp
@@ -48,11 +48,7 @@
 <%@ page import="com.liferay.portal.webserver.WebServerServletTokenUtil" %>
 <%@ page import="com.liferay.portal.service.VirtualHostLocalServiceUtil" %>
 <%@ page import="org.gcube.portlets.user.thematicgateways.*" %>
-<%@ page import="org.gcube.portlets.user.vreyard.VreYard" %>
-<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.DetachedREs"%>
-<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.Gateway"%>
-<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.VO"%>
-<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.VRE"%>
+
 
 
 
diff --git a/src/main/webapp/html/vreyard/view.jsp b/src/main/webapp/html/vreyard/view.jsp
index 362c66a..d371d4d 100644
--- a/src/main/webapp/html/vreyard/view.jsp
+++ b/src/main/webapp/html/vreyard/view.jsp
@@ -1,5 +1,10 @@
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
 <%@include file="../init.jsp"%>
+<%@ page import="org.gcube.portlets.user.vreyard.VreYard" %>
+<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.DetachedREs"%>
+<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.Gateway"%>
+<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.VO"%>
+<%@ page import="org.gcube.infrastructure.detachedres.detachedreslibrary.shared.re.VRE"%>
 
 <portlet:defineObjects />