From 691f3197d83c236e974847125235b397d535bcab Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 9 Jun 2015 14:54:04 +0000 Subject: [PATCH] ported to HomeLibrary 2.0 and GWT 2.7.0 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@115269 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 4 +-- .settings/org.eclipse.jst.jsp.core.prefs | 3 +++ .settings/org.eclipse.wst.common.component | 6 ++--- ...se.wst.common.project.facet.core.prefs.xml | 7 ++++++ ....eclipse.wst.common.project.facet.core.xml | 2 ++ pom.xml | 25 ++++++++++++++++--- .../servlet/DownloadEncryptedReport.java | 2 +- .../server/servlet/ImagesUtil.java | 13 +++++++--- .../server/servlet/ReportServiceImpl.java | 13 +++++----- 9 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 .settings/org.eclipse.jst.jsp.core.prefs create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.prefs.xml diff --git a/.classpath b/.classpath index d9bb5fe..f402da6 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/org.eclipse.jst.jsp.core.prefs b/.settings/org.eclipse.jst.jsp.core.prefs new file mode 100644 index 0000000..3a5c98d --- /dev/null +++ b/.settings/org.eclipse.jst.jsp.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +validateFragments=false +validation.use-project-settings=true diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index e3cf779..71f50e1 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,13 +1,13 @@ - + - + uses - + uses diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 0000000..cc81385 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 6491a24..fdfd85f 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -4,4 +4,6 @@ + + diff --git a/pom.xml b/pom.xml index 7bfd9dc..98ba63e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports war - 4.12.1-SNAPSHOT + 4.13.0-SNAPSHOT gCube Reports Manager gCube Reports Portlet. @@ -24,7 +24,7 @@ - 2.5.1 + 2.7.0 distro @@ -70,11 +70,13 @@ com.google.gwt gwt-user + ${gwtVersion} ${setScope} com.google.gwt gwt-servlet + ${gwtVersion} ${setScope} @@ -109,8 +111,9 @@ com.sencha.gxt - gxt - 2.2.5 + gxt2.2.5-gwt2.X + 2.7.0 + compile com.allen-sauer.gwt.log @@ -198,14 +201,28 @@ org.gcube.common home-library + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided + + + asm-all + asm + + org.gcube.common home-library-jcr + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided + + org.gcube.common + home-library-model + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + org.gcube.applicationsupportlayer accesslogger diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DownloadEncryptedReport.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DownloadEncryptedReport.java index 777a8e4..bf5f845 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DownloadEncryptedReport.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DownloadEncryptedReport.java @@ -15,10 +15,10 @@ import javax.servlet.http.HttpServletResponse; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; +import org.gcube.common.homelibary.model.items.type.FolderItemType; import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; -import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType; import org.gcube.common.homelibrary.home.workspace.folder.items.Report; import org.gcube.common.homelibrary.home.workspace.folder.items.ReportTemplate; import org.gcube.common.homelibrary.util.encryption.EncryptionUtil; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUtil.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUtil.java index 3f3276e..75af60c 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUtil.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUtil.java @@ -1,9 +1,10 @@ package org.gcube.portlets.user.reportgenerator.server.servlet; +import org.gcube.common.homelibary.model.items.type.FolderItemType; +import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; -import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType; import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage; -import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.ImageDocument; +import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem; public class ImagesUtil { public static final String GIF = "image/gif"; @@ -27,8 +28,12 @@ public class ImagesUtil { } if (bi.getFolderItemType()==FolderItemType.IMAGE_DOCUMENT){ - ImageDocument image = (ImageDocument) bi; - mimetype = image.getMimeType(); + GCubeItem image = (GCubeItem) bi; + try { + mimetype = image.getMimeType(); + } catch (InternalErrorException e) { + e.printStackTrace(); + } } if (mimetype.equals(GIF)) diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java index b19b322..0d88155 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java @@ -52,23 +52,24 @@ import org.gcube.application.rsg.support.model.components.impl.CompiledReport; import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; import org.gcube.common.encryption.StringEncrypter; +import org.gcube.common.homelibary.model.items.type.FolderItemType; +import org.gcube.common.homelibary.model.items.type.NodeProperty; +import org.gcube.common.homelibary.model.items.type.WorkspaceItemType; import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException; import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; -import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType; import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.common.homelibrary.home.workspace.exceptions.ItemAlreadyExistException; import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException; import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException; import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; -import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType; import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage; +import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem; import org.gcube.common.homelibrary.home.workspace.folder.items.Report; import org.gcube.common.homelibrary.home.workspace.folder.items.ReportTemplate; -import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.ImageDocument; import org.gcube.common.homelibrary.home.workspace.folder.items.ts.TimeSeries; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; @@ -886,10 +887,10 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe _log.debug("Got inputStream"); } else if (imageItem.getFolderItemType()==FolderItemType.IMAGE_DOCUMENT){ - ImageDocument image = (ImageDocument)item; + GCubeItem image = (GCubeItem)item; if (image.getMimeType().equals("image/tiff")) - data = image.getThumbnail(); - else +// image.getProperties().getProperties().get(NodeProperty.THUMBNAIL_DATA); //this is a problem +// else data = image.getData(); } if (data != null) {