From 4a0a4c0c647f681b8941e7ae9176115ada1fbc39 Mon Sep 17 00:00:00 2001 From: francesco Date: Mon, 26 Oct 2020 12:24:23 +0100 Subject: [PATCH] added portlet configurations --- pom.xml | 32 +++++++++++++ .../client/GeoportalDataViewer.java | 20 ++++++-- ...e.java => GeoportalDataViewerService.java} | 4 +- ...a => GeoportalDataViewerServiceAsync.java} | 10 ++-- .../geoportaldataviewer/client/Messages.java | 13 ----- .../client/gis/OsmExample.java | 3 -- .../client/ui/BasePanel.java | 6 --- .../GeoPortalDataViewerAppPortlet.java | 47 +++++++++++++++++++ ...va => GeoportalDataViewerServiceImpl.java} | 6 +-- .../GeoPortalDataViewerAppPortlet_view.jsp | 22 +++++++++ src/main/webapp/WEB-INF/liferay-display.xml | 5 ++ .../WEB-INF/liferay-plugin-package.properties | 9 ++++ src/main/webapp/WEB-INF/liferay-portlet.xml | 11 +++++ src/main/webapp/WEB-INF/portlet.xml | 25 ++++++++++ src/main/webapp/WEB-INF/web.xml | 18 +++---- .../client/GwtTestGeoportalDataViewer.java | 2 +- 16 files changed, 188 insertions(+), 45 deletions(-) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/{GreetingService.java => GeoportalDataViewerService.java} (70%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/{GreetingServiceAsync.java => GeoportalDataViewerServiceAsync.java} (69%) delete mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/Messages.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/portlet/GeoPortalDataViewerAppPortlet.java rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/{GreetingServiceImpl.java => GeoportalDataViewerServiceImpl.java} (87%) create mode 100644 src/main/webapp/WEB-INF/jsp/GeoPortalDataViewerAppPortlet_view.jsp create mode 100644 src/main/webapp/WEB-INF/liferay-display.xml create mode 100644 src/main/webapp/WEB-INF/liferay-plugin-package.properties create mode 100644 src/main/webapp/WEB-INF/liferay-portlet.xml create mode 100644 src/main/webapp/WEB-INF/portlet.xml diff --git a/pom.xml b/pom.xml index 55d7f6e..f612bed 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + com.google.gwt @@ -77,6 +89,26 @@ 2.3.2.0 compile + + + org.gcube.common.portal + portal-manager + [2.4.1,3.0.0-SNAPSHOT) + provided + + + + com.liferay.portal + portal-service + 6.2.5 + provided + + + javax.portlet + portlet-api + 2.0 + provided + junit junit diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java index d6c11a7..e377350 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java @@ -10,6 +10,7 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; /** @@ -27,9 +28,7 @@ public class GeoportalDataViewer implements EntryPoint { /** * Create a remote service proxy to talk to the server-side Greeting service. */ - private final GreetingServiceAsync greetingService = GWT.create(GreetingService.class); - - private final Messages messages = GWT.create(Messages.class); + private final GeoportalDataViewerServiceAsync greetingService = GWT.create(GeoportalDataViewerService.class); public final static String APP_DIV = "geoportal-data-viewer"; @@ -69,6 +68,21 @@ public class GeoportalDataViewer implements EntryPoint { mainPanel.setHeight(event.getHeight()-200); } }); + + greetingService.greetServer("SERVICE IMPL", new AsyncCallback() { + + @Override + public void onSuccess(String result) { + Window.alert(result); + + } + + @Override + public void onFailure(Throwable caught) { + + + } + }); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GreetingService.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java similarity index 70% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GreetingService.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java index ba21fa5..0c61c37 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GreetingService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java @@ -6,7 +6,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * The client side stub for the RPC service. */ -@RemoteServiceRelativePath("greet") -public interface GreetingService extends RemoteService { +@RemoteServiceRelativePath("geoportaldataviewerservice") +public interface GeoportalDataViewerService extends RemoteService { String greetServer(String name) throws IllegalArgumentException; } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GreetingServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java similarity index 69% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GreetingServiceAsync.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java index 2ceebf6..ba70d93 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GreetingServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java @@ -3,12 +3,12 @@ package org.gcube.portlets.user.geoportaldataviewer.client; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; -public interface GreetingServiceAsync +public interface GeoportalDataViewerServiceAsync { /** * GWT-RPC service asynchronous (client-side) interface - * @see org.gcube.portlets.user.geoportaldataviewer.client.GreetingService + * @see org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerService */ void greetServer( java.lang.String name, AsyncCallback callback ); @@ -18,13 +18,13 @@ public interface GreetingServiceAsync */ public static final class Util { - private static GreetingServiceAsync instance; + private static GeoportalDataViewerServiceAsync instance; - public static final GreetingServiceAsync getInstance() + public static final GeoportalDataViewerServiceAsync getInstance() { if ( instance == null ) { - instance = (GreetingServiceAsync) GWT.create( GreetingService.class ); + instance = (GeoportalDataViewerServiceAsync) GWT.create( GeoportalDataViewerService.class ); } return instance; } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/Messages.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/Messages.java deleted file mode 100644 index 466ede9..0000000 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/Messages.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.gcube.portlets.user.geoportaldataviewer.client; - -import com.google.gwt.i18n.client.LocalizableResource.Generate; - -@Generate(format = "com.google.gwt.i18n.server.PropertyCatalogFactory") -public interface Messages extends com.google.gwt.i18n.client.Messages { - - @DefaultMessage("Enter your name") - String nameField(); - - @DefaultMessage("Send") - String sendButton(); -} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OsmExample.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OsmExample.java index f602b26..c59ca27 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OsmExample.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OsmExample.java @@ -3,7 +3,6 @@ package org.gcube.portlets.user.geoportaldataviewer.client.gis; import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants; import ol.Coordinate; -import ol.Extent; import ol.Map; import ol.MapOptions; import ol.OLFactory; @@ -21,8 +20,6 @@ import ol.source.ImageWms; import ol.source.ImageWmsOptions; import ol.source.ImageWmsParams; import ol.source.Osm; -import ol.source.TileDebug; -import ol.source.TileDebugOptions; import ol.source.XyzOptions; /** diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/BasePanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/BasePanel.java index dbc93c3..15f455b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/BasePanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/BasePanel.java @@ -1,14 +1,8 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.Widget; public class BasePanel extends Composite { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/portlet/GeoPortalDataViewerAppPortlet.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/portlet/GeoPortalDataViewerAppPortlet.java new file mode 100644 index 0000000..c42d0be --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/portlet/GeoPortalDataViewerAppPortlet.java @@ -0,0 +1,47 @@ +package org.gcube.portlets.user.geoportaldataviewer.portlet; + +import java.io.IOException; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import org.gcube.common.portal.PortalContext; + + +/** + * The Class GeoPortalDataEntryApp. + * + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * + * Oct 8, 2020 + */ +public class GeoPortalDataViewerAppPortlet extends GenericPortlet{ + + /** + * JSP folder name + */ + public static final String JSP_FOLDER = "/WEB-INF/jsp/"; + + /** + * + */ + public static final String VIEW_JSP = JSP_FOLDER + "GeoPortalDataViewerAppPortlet_view.jsp"; + + /** + * Do view. + * + * @param request . + * @param response . + * @throws PortletException . + * @throws IOException . + */ + public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { + //System.out.println("LOADING ********* FROM "+VIEW_JSP); + PortalContext.setUserInSession(request); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(VIEW_JSP); + rd.include(request,response); + } +} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GreetingServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GreetingServiceImpl.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java index 75a757b..ff1a6db 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GreetingServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java @@ -1,6 +1,6 @@ package org.gcube.portlets.user.geoportaldataviewer.server; -import org.gcube.portlets.user.geoportaldataviewer.client.GreetingService; +import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerService; import org.gcube.portlets.user.geoportaldataviewer.shared.FieldVerifier; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -9,8 +9,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; * The server side implementation of the RPC service. */ @SuppressWarnings("serial") -public class GreetingServiceImpl extends RemoteServiceServlet implements - GreetingService { +public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet implements + GeoportalDataViewerService { public String greetServer(String input) throws IllegalArgumentException { // Verify that the input is valid. diff --git a/src/main/webapp/WEB-INF/jsp/GeoPortalDataViewerAppPortlet_view.jsp b/src/main/webapp/WEB-INF/jsp/GeoPortalDataViewerAppPortlet_view.jsp new file mode 100644 index 0000000..3e6036d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/GeoPortalDataViewerAppPortlet_view.jsp @@ -0,0 +1,22 @@ +ac<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%-- Uncomment below lines to add portlet taglibs to jsp +<%@ page import="javax.portlet.*"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%> + + +--%> + + + + + + + + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml new file mode 100644 index 0000000..03d22a7 --- /dev/null +++ b/src/main/webapp/WEB-INF/liferay-display.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties new file mode 100644 index 0000000..24e0526 --- /dev/null +++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties @@ -0,0 +1,9 @@ +name=GeoPortalDataViewerAppPortlet +module-group-id=liferay +module-incremental-version=2 +tags= +short-description= +change-log= +page-url=http://www.gcube-system.org +author=gCube +licenses=EUPL \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml new file mode 100644 index 0000000..551e405 --- /dev/null +++ b/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -0,0 +1,11 @@ + + + + + + GeoPortalDataViewerAppPortlet + false + false + false + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml new file mode 100644 index 0000000..91b75f5 --- /dev/null +++ b/src/main/webapp/WEB-INF/portlet.xml @@ -0,0 +1,25 @@ + + + + GeoPortalDataViewerApp Portlet + GeoPortalDataViewerAppPortlet + GeoPortal-DataViewerApp-Portlet + org.gcube.portlets.user.geoportaldataviewer.portlet.GeoPortalDataViewerAppPortlet + + 0 + + text/html + VIEW + + + GeoPortal DataViewerApp Portlet + GeoPortal DataViewerApp Portlet + + + + portletSetupShowBorders + false + + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 407f905..527e6b5 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,19 +1,19 @@ - - - + - greetServlet - org.gcube.portlets.user.geoportaldataviewer.server.GreetingServiceImpl + geoportalDataViewerServlet + org.gcube.portlets.user.geoportaldataviewer.server.GeoportalDataViewerServiceImpl - greetServlet - /GeoportalDataViewer/greet + geoportalDataViewerServlet + /GeoportalDataViewer/geoportaldataviewerservice diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/client/GwtTestGeoportalDataViewer.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/client/GwtTestGeoportalDataViewer.java index 7c69d03..fd9ec48 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/client/GwtTestGeoportalDataViewer.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/client/GwtTestGeoportalDataViewer.java @@ -43,7 +43,7 @@ public class GwtTestGeoportalDataViewer extends GWTTestCase { */ public void testGreetingService() { // Create the service that we will test. - GreetingServiceAsync greetingService = GWT.create(GreetingService.class); + GeoportalDataViewerServiceAsync greetingService = GWT.create(GeoportalDataViewerService.class); ServiceDefTarget target = (ServiceDefTarget) greetingService; target.setServiceEntryPoint(GWT.getModuleBaseURL() + "GeoportalDataViewer/greet");