diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2dc054b..1fa7eb1 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,6 +5,9 @@ + + uses + diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/pom.xml b/pom.xml index 7f7904b..70bbbd4 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - 2.4.0 + 2.5.1 distro @@ -55,6 +55,17 @@ + + + + org.gcube.distribution + maven-portal-bom + LATEST + pom + import + + + @@ -67,35 +78,30 @@ com.google.gwt gwt-user - ${gwtVersion} ${setScope} com.google.gwt gwt-servlet - ${gwtVersion} ${setScope} org.gcube.applicationsupportlayer aslcore - [3.2.1-SNAPSHOT, 3.2.2-SNAPSHOT) provided org.gcube.applicationsupportlayer aslsocial - [0.1.0-SNAPSHOT, 1.0.0-SNAPSHOT) - ${setScope} + ${setScope} org.gcube.portlets.user gcube-widgets - [1.5.0-SNAPSHOT, 2.0.0-SNAPSHOT) ${setScope} - org.gcube.portlets.user + org.gcube.portlets.widgets guided-tour-widget [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) ${setScope} @@ -103,7 +109,6 @@ org.gcube.portal custom-portal-handler - [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) ${setScope} @@ -119,9 +124,8 @@ ${setScope} - org.gcube.portlets.user + org.gcube.portlets.widgets workspace-light-tree - [2.9.0-SNAPSHOT, 3.0.0-SNAPSHOT) ${setScope} @@ -131,9 +135,9 @@ ${setScope} - org.gcube.portlets.user + org.gcube.portlets.widgets report-exporter-widget - 1.0.0-SNAPSHOT + [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) org.gcube.portal @@ -144,7 +148,6 @@ org.gcube.portlets.user workspace-tree-widget - [6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT) ${setScope} @@ -154,22 +157,19 @@ ${setScope} - org.gcube.portlets.user + org.gcube.common home-library - [4.3.0-SNAPSHOT,5.0.0-SNAPSHOT) provided - org.gcube.portlets.user + org.gcube.common home-library-jcr - [1.3.0-SNAPSHOT,2.0.0-SNAPSHOT) provided org.gcube.applicationsupportlayer accesslogger - [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) ${setScope} @@ -181,7 +181,6 @@ commons-fileupload commons-fileupload - 1.2.2 ${setScope} @@ -193,31 +192,26 @@ com.allen-sauer.gwt.log gwt-log - 3.1.8 ${setScope} javax.portlet portlet-api - 2.0 ${setScope} log4j log4j - 1.2.16 ${setScope} org.slf4j slf4j-log4j12 - 1.6.4 runtime org.slf4j slf4j-api - 1.6.4 runtime @@ -225,7 +219,7 @@ junit 4.7 test - + diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java index 5f18579..9aae4b9 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java @@ -11,10 +11,10 @@ import org.gcube.portlets.user.reportgenerator.client.dialog.ImporterDialog; import org.gcube.portlets.user.reportgenerator.client.dialog.PagePropertiesDialog; import org.gcube.portlets.user.reportgenerator.client.model.ExportManifestationType; import org.gcube.portlets.user.reportgenerator.client.model.TemplateModel; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler; -import org.gcube.portlets.user.workspace.lighttree.client.load.WorkspaceLightTreeLoadPopup; +import org.gcube.portlets.widgets.lighttree.client.ItemType; +import org.gcube.portlets.widgets.lighttree.client.event.PopupEvent; +import org.gcube.portlets.widgets.lighttree.client.event.PopupHandler; +import org.gcube.portlets.widgets.lighttree.client.load.WorkspaceLightTreeLoadPopup; import com.extjs.gxt.ui.client.widget.MessageBox; import com.google.gwt.core.client.GWT; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java index 5f4e423..da9d9d2 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java @@ -3,11 +3,11 @@ package org.gcube.portlets.user.reportgenerator.client.Presenter; import org.gcube.portlets.user.reportgenerator.client.ReportConstants; import org.gcube.portlets.user.reportgenerator.client.dialog.ImporterDialog; import org.gcube.portlets.user.reportgenerator.client.model.TemplateModel; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler; -import org.gcube.portlets.user.workspace.lighttree.client.load.WorkspaceLightTreeLoadPopup; -import org.gcube.portlets.user.workspace.lighttree.client.save.WorkspaceLightTreeSavePopup; +import org.gcube.portlets.widgets.lighttree.client.ItemType; +import org.gcube.portlets.widgets.lighttree.client.event.PopupEvent; +import org.gcube.portlets.widgets.lighttree.client.event.PopupHandler; +import org.gcube.portlets.widgets.lighttree.client.load.WorkspaceLightTreeLoadPopup; +import org.gcube.portlets.widgets.lighttree.client.save.WorkspaceLightTreeSavePopup; import com.extjs.gxt.ui.client.event.ColorPaletteEvent; import com.extjs.gxt.ui.client.event.Events; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index 44f59de..d95ba40 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -7,12 +7,12 @@ import org.gcube.portlets.d4sreporting.common.client.uicomponents.richtext.RichT import org.gcube.portlets.d4sreporting.common.shared.ComponentType; import org.gcube.portlets.d4sreporting.common.shared.Metadata; import org.gcube.portlets.d4sreporting.common.shared.Model; -import org.gcube.portlets.user.exporter.client.ReportExporterPopup; -import org.gcube.portlets.user.exporter.client.event.ExportingCompletedEvent; -import org.gcube.portlets.user.exporter.client.event.ExportingCompletedEventHandler; -import org.gcube.portlets.user.exporter.client.event.ReportExporterEvent; -import org.gcube.portlets.user.exporter.client.event.ReportExporterEventHandler; -import org.gcube.portlets.user.exporter.shared.TypeExporter; +import org.gcube.portlets.widgets.exporter.client.ReportExporterPopup; +import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEvent; +import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEventHandler; +import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEvent; +import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEventHandler; +import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import org.gcube.portlets.user.reportgenerator.client.Headerbar; import org.gcube.portlets.user.reportgenerator.client.ReportGenerator; import org.gcube.portlets.user.reportgenerator.client.ReportService; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java index ac87873..d4dd800 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java @@ -1,15 +1,15 @@ package org.gcube.portlets.user.reportgenerator.client; -import org.gcube.portlets.user.guidedtour.client.GCUBEGuidedTour; -import org.gcube.portlets.user.guidedtour.client.steps.GCUBETemplate1Text1Image; -import org.gcube.portlets.user.guidedtour.client.steps.GCUBETemplate2Text2Image; -import org.gcube.portlets.user.guidedtour.client.steps.TourStep; -import org.gcube.portlets.user.guidedtour.client.types.VerticalAlignment; +import org.gcube.portlets.widgets.guidedtour.client.GCUBEGuidedTour; +import org.gcube.portlets.widgets.guidedtour.client.steps.GCUBETemplate1Text1Image; +import org.gcube.portlets.widgets.guidedtour.client.steps.GCUBETemplate2Text2Image; +import org.gcube.portlets.widgets.guidedtour.client.steps.TourStep; +import org.gcube.portlets.widgets.guidedtour.client.types.VerticalAlignment; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; import org.gcube.portlets.user.reportgenerator.client.toursteps.Intro; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceServiceAsync; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; +import org.gcube.portlets.widgets.lighttree.client.ItemType; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportService.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportService.java index 264039b..2edce4b 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportService.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportService.java @@ -3,9 +3,9 @@ package org.gcube.portlets.user.reportgenerator.client; import org.gcube.portlets.d4sreporting.common.shared.Model; import org.gcube.portlets.d4sreporting.common.shared.RepTimeSeries; import org.gcube.portlets.d4sreporting.common.shared.Table; -import org.gcube.portlets.user.exporter.shared.SaveReportFileException; -import org.gcube.portlets.user.exporter.shared.SaveReportFileExistException; -import org.gcube.portlets.user.exporter.shared.TypeExporter; +import org.gcube.portlets.widgets.exporter.shared.SaveReportFileException; +import org.gcube.portlets.widgets.exporter.shared.SaveReportFileExistException; +import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import org.gcube.portlets.user.reportgenerator.shared.SessionInfo; import com.google.gwt.user.client.rpc.RemoteService; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportServiceAsync.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportServiceAsync.java index 482a3e7..de149ce 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportServiceAsync.java @@ -3,7 +3,7 @@ package org.gcube.portlets.user.reportgenerator.client; import org.gcube.portlets.d4sreporting.common.shared.Model; import org.gcube.portlets.d4sreporting.common.shared.RepTimeSeries; import org.gcube.portlets.d4sreporting.common.shared.Table; -import org.gcube.portlets.user.exporter.shared.TypeExporter; +import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import org.gcube.portlets.user.reportgenerator.shared.SessionInfo; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java index 416b7ec..6d80b25 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.reportgenerator.client.dialog; import org.gcube.portlets.d4sreporting.common.shared.Model; import org.gcube.portlets.user.reportgenerator.client.ReportConstants; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; -import org.gcube.portlets.user.workspace.lighttree.client.Item; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; +import org.gcube.portlets.widgets.lighttree.client.Item; +import org.gcube.portlets.widgets.lighttree.client.ItemType; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java index 9a3f01f..06a6ab5 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java @@ -12,10 +12,10 @@ import org.gcube.portlets.user.reportgenerator.client.model.TemplateModel; import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItem; import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExternalImage; import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTImageDocument; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler; -import org.gcube.portlets.user.workspace.lighttree.client.load.WorkspaceLightTreeLoadPopup; +import org.gcube.portlets.widgets.lighttree.client.ItemType; +import org.gcube.portlets.widgets.lighttree.client.event.PopupEvent; +import org.gcube.portlets.widgets.lighttree.client.event.PopupHandler; +import org.gcube.portlets.widgets.lighttree.client.load.WorkspaceLightTreeLoadPopup; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java index 8e068ab..cb3e42c 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java @@ -1,13 +1,13 @@ package org.gcube.portlets.user.reportgenerator.client.uibinder; -import org.gcube.portlets.user.exporter.shared.TypeExporter; +import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import org.gcube.portlets.user.reportgenerator.client.ReportServiceAsync; import org.gcube.portlets.user.reportgenerator.client.ToolboxPanel; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler; -import org.gcube.portlets.user.workspace.lighttree.client.save.WorkspaceLightTreeSavePopup; +import org.gcube.portlets.widgets.lighttree.client.ItemType; +import org.gcube.portlets.widgets.lighttree.client.event.PopupEvent; +import org.gcube.portlets.widgets.lighttree.client.event.PopupHandler; +import org.gcube.portlets.widgets.lighttree.client.save.WorkspaceLightTreeSavePopup; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DocLibraryUtil.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DocLibraryUtil.java index bfd8e54..9e3dfe4 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DocLibraryUtil.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/DocLibraryUtil.java @@ -5,11 +5,12 @@ import java.util.ArrayList; import java.util.List; import org.gcube.application.framework.core.session.ASLSession; -import org.gcube.common.core.utils.logging.GCUBELog; import org.gcube.portal.custom.communitymanager.OrganizationsUtil; import org.gcube.portlets.admin.wfdocslibrary.shared.PermissionType; import org.gcube.portlets.admin.wfdocslibrary.shared.Step; import org.gcube.portlets.admin.wfdocslibrary.shared.WfRole; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -17,7 +18,6 @@ import com.liferay.portal.model.Organization; import com.liferay.portal.model.ResourceConstants; import com.liferay.portal.model.Role; import com.liferay.portal.model.User; -import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.PermissionLocalServiceUtil; import com.liferay.portal.service.ResourceLocalServiceUtil; @@ -35,7 +35,8 @@ public class DocLibraryUtil { /** * */ - private static GCUBELog log = new GCUBELog(DocLibraryUtil.class); + private static final Logger log = LoggerFactory.getLogger(DocLibraryUtil.class); + /** * write the Report File (payload) into Liferay DocLibrary in the workflowdocs folder 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 6c88d9c..777a8e4 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,14 +15,14 @@ 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.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; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; -import org.gcube.portlets.user.homelibrary.home.HomeLibrary; -import org.gcube.portlets.user.homelibrary.home.workspace.Workspace; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.FolderItem; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.FolderItemType; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.Report; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.ReportTemplate; -import org.gcube.portlets.user.homelibrary.util.encryption.EncryptionUtil; @SuppressWarnings("serial") public class DownloadEncryptedReport extends HttpServlet { @@ -37,7 +37,7 @@ public class DownloadEncryptedReport extends HttpServlet { String fileName = null; InputStream data = null; try { - Workspace workspace = HomeLibrary.getUserWorkspace(getASLSession(request)); + Workspace workspace = HomeLibrary.getUserWorkspace(getASLSession(request).getUsername()); item = (FolderItem)workspace.getItem(request.getParameter("itemId")); if (item.getFolderItemType() == FolderItemType.REPORT) { diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUploadServlet.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUploadServlet.java index b2d9414..bb0fda0 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ImagesUploadServlet.java @@ -14,7 +14,8 @@ import javax.servlet.http.HttpSession; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.common.core.utils.logging.GCUBEClientLog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ImagesUploadServlet class is the server code delgated to receinve the byte stream and store i @@ -25,7 +26,8 @@ import org.gcube.common.core.utils.logging.GCUBEClientLog; public class ImagesUploadServlet extends HttpServlet { - static GCUBEClientLog _log = new GCUBEClientLog(ImagesUploadServlet.class); + + private static final Logger _log = LoggerFactory.getLogger(ImagesUploadServlet.class); final String returnOKMessage = "OK"; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/NotificationsThread.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/NotificationsThread.java index 34f01a0..9c18a6f 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/NotificationsThread.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/NotificationsThread.java @@ -5,9 +5,10 @@ import java.util.List; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; -import org.gcube.common.core.utils.logging.GCUBEClientLog; -import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceFolder; -import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceItem; +import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; +import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -15,7 +16,8 @@ import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceItem; * */ public class NotificationsThread implements Runnable { - private static GCUBEClientLog _log = new GCUBEClientLog(NotificationsThread.class); + private static final Logger _log = LoggerFactory.getLogger(NotificationsThread.class); + private static final String WORKSPACE_PORTLET_ID = "org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl"; 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 dc12c85..baae045 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 @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.UUID; import java.util.Vector; import javax.servlet.http.HttpServletRequest; @@ -32,7 +31,24 @@ import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; -import org.gcube.common.core.utils.logging.GCUBEClientLog; +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.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.portal.custom.communitymanager.OrganizationsUtil; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.admin.wfdocslibrary.client.WfDocsLibrary; @@ -47,27 +63,6 @@ import org.gcube.portlets.d4sreporting.common.shared.RepTimeSeries; import org.gcube.portlets.d4sreporting.common.shared.RepeatableSequence; import org.gcube.portlets.d4sreporting.common.shared.Table; import org.gcube.portlets.d4sreporting.common.shared.TableCell; -import org.gcube.portlets.user.exporter.shared.SaveReportFileException; -import org.gcube.portlets.user.exporter.shared.SaveReportFileExistException; -import org.gcube.portlets.user.exporter.shared.TypeExporter; -import org.gcube.portlets.user.homelibrary.home.HomeLibrary; -import org.gcube.portlets.user.homelibrary.home.exceptions.HomeNotFoundException; -import org.gcube.portlets.user.homelibrary.home.exceptions.InternalErrorException; -import org.gcube.portlets.user.homelibrary.home.workspace.Workspace; -import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceFolder; -import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceItem; -import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceItemType; -import org.gcube.portlets.user.homelibrary.home.workspace.WorkspaceSharedFolder; -import org.gcube.portlets.user.homelibrary.home.workspace.exceptions.ItemAlreadyExistException; -import org.gcube.portlets.user.homelibrary.home.workspace.exceptions.ItemNotFoundException; -import org.gcube.portlets.user.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.FolderItem; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.FolderItemType; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.ExternalImage; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.Report; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.ReportTemplate; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.gcube.ImageDocument; -import org.gcube.portlets.user.homelibrary.home.workspace.folder.items.ts.TimeSeries; import org.gcube.portlets.user.reportgenerator.client.ReportConstants; import org.gcube.portlets.user.reportgenerator.client.ReportService; import org.gcube.portlets.user.reportgenerator.server.servlet.loggers.CreateReportLogEntry; @@ -76,6 +71,11 @@ import org.gcube.portlets.user.reportgenerator.server.servlet.loggers.OpenWorkfl import org.gcube.portlets.user.reportgenerator.server.servlet.loggers.SaveWorkflowLogEntry; import org.gcube.portlets.user.reportgenerator.shared.SessionInfo; import org.gcube.portlets.user.reportgenerator.shared.UserBean; +import org.gcube.portlets.widgets.exporter.shared.SaveReportFileException; +import org.gcube.portlets.widgets.exporter.shared.SaveReportFileExistException; +import org.gcube.portlets.widgets.exporter.shared.TypeExporter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.liferay.portal.model.UserModel; @@ -93,7 +93,7 @@ import com.liferay.portlet.documentlibrary.model.DLFileEntry; @SuppressWarnings("serial") public class ReportServiceImpl extends RemoteServiceServlet implements ReportService { - public static GCUBEClientLog _log = new GCUBEClientLog(ReportServiceImpl.class); + private static final Logger _log = LoggerFactory.getLogger(ReportServiceImpl.class); /** * used for debugging in eclipse */ @@ -601,7 +601,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe * @throws HomeNotFoundException */ protected Workspace getWorkspaceArea() throws WorkspaceFolderNotFoundException, InternalErrorException, HomeNotFoundException { - return HomeLibrary.getUserWorkspace(getASLSession()); + return HomeLibrary.getUserWorkspace(getASLSession().getUsername()); } @@ -1517,7 +1517,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe try { File file = new File(filePath); - Workspace workspace = HomeLibrary.getUserWorkspace(getASLSession()); + Workspace workspace = HomeLibrary.getUserWorkspace(getASLSession().getUsername()); _log.info("Saving in Workspace of " + workspace.getOwner().getPortalLogin()); WorkspaceFolder folder = (workspaceFolderId != null)? (WorkspaceFolder)workspace.getItem(workspaceFolderId):workspace.getRoot(); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ZipUtil.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ZipUtil.java index 890a676..a2afeca 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ZipUtil.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ZipUtil.java @@ -12,7 +12,8 @@ import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; import org.apache.commons.io.IOUtils; -import org.gcube.common.core.utils.logging.GCUBELog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -21,8 +22,7 @@ import org.gcube.common.core.utils.logging.GCUBELog; */ public class ZipUtil { - - public static GCUBELog logger = new GCUBELog(ZipUtil.class); + private static final Logger logger = LoggerFactory.getLogger(ZipUtil.class); /** * @param zipFileName zipFileName