From e9972d4742acf2146abfa5fa0a4784d517d3fcbb Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 8 Feb 2017 10:52:16 +0000 Subject: [PATCH] Removed dependency towards access logger git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@142372 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 ++-- .settings/org.eclipse.wst.common.component | 3 +- distro/changelog.xml | 4 +++ pom.xml | 7 +---- .../server/servlet/ReportServiceImpl.java | 18 ++++-------- .../servlet/loggers/CreateReportLogEntry.java | 26 ----------------- .../loggers/GenerateReportLogEntry.java | 28 ------------------- .../servlet/loggers/OpenReportLogEntry.java | 27 ------------------ .../servlet/loggers/OpenWorkflowLogEntry.java | 28 ------------------- .../servlet/loggers/SaveWorkflowLogEntry.java | 28 ------------------- 10 files changed, 14 insertions(+), 161 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/CreateReportLogEntry.java delete mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/GenerateReportLogEntry.java delete mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenReportLogEntry.java delete mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenWorkflowLogEntry.java delete mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/SaveWorkflowLogEntry.java diff --git a/.classpath b/.classpath index 9476f89..4474544 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -39,5 +39,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d7c7ad5..8a0a2b9 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,8 +5,7 @@ - - + uses diff --git a/distro/changelog.xml b/distro/changelog.xml index 780f1cd..b9eaed1 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Removed dependency towards access logger + Ported to Liferay 6.2 diff --git a/pom.xml b/pom.xml index 35d575d..8e94424 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports-manager-portlet war - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT gCube Reports Manager gCube Reports Portlet. @@ -214,11 +214,6 @@ home-library-model provided - - org.gcube.applicationsupportlayer - accesslogger - provided - org.apache.derby derby 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 3057393..4d15eb7 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 @@ -24,18 +24,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.xml.bind.DatatypeConverter; -import net.sf.csv4j.CSVFileProcessor; -import net.sf.csv4j.CSVLineProcessor; -import net.sf.csv4j.ParseException; -import net.sf.csv4j.ProcessingException; - import org.apache.commons.io.IOUtils; import org.apache.tika.config.TikaConfig; import org.apache.tika.detect.Detector; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; -import org.gcube.application.framework.accesslogger.library.impl.AccessLogger; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; import org.gcube.application.reporting.reader.ModelReader; @@ -58,7 +52,6 @@ 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.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; @@ -84,8 +77,6 @@ import org.gcube.portlets.d4sreporting.common.shared.Table; import org.gcube.portlets.d4sreporting.common.shared.TableCell; 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; -import org.gcube.portlets.user.reportgenerator.server.servlet.loggers.OpenReportLogEntry; import org.gcube.portlets.user.reportgenerator.shared.RSGAccessPoint; import org.gcube.portlets.user.reportgenerator.shared.ReportImage; import org.gcube.portlets.user.reportgenerator.shared.SessionInfo; @@ -113,6 +104,11 @@ import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.liferay.portal.service.UserLocalServiceUtil; +import net.sf.csv4j.CSVFileProcessor; +import net.sf.csv4j.CSVLineProcessor; +import net.sf.csv4j.ParseException; +import net.sf.csv4j.ProcessingException; + @@ -388,10 +384,6 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe _log.debug("storeTemplateInSession DONE"); } - AccessLogger log = AccessLogger.getAccessLogger(); - OpenReportLogEntry logEntry = new OpenReportLogEntry(toReturn.getTemplateName(), templateObjectID); - log.logEntry(getASLSession().getUsername(), getASLSession().getScopeName(), logEntry); - if (! isTemplate) { try { ModelReader reader = new ModelReader(toReturn); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/CreateReportLogEntry.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/CreateReportLogEntry.java deleted file mode 100644 index 8adc081..0000000 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/CreateReportLogEntry.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.gcube.portlets.user.reportgenerator.server.servlet.loggers; - -import org.gcube.application.framework.accesslogger.model.AccessLogEntry; - -/** - * Represents an access log entry for creating a new Template - */ -public class CreateReportLogEntry extends AccessLogEntry{ - - private String templateName; - - private String templateId; - - public CreateReportLogEntry(String templateName, String templateId) { - super("Create_Report"); - this.templateName = replaceReservedChars(templateName); - this.templateId = replaceReservedChars(templateId); - } - - @Override - public String getLogMessage() { - String message = "Name = " + templateName + "|ID = " + templateId; - return message; - } - -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/GenerateReportLogEntry.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/GenerateReportLogEntry.java deleted file mode 100644 index dc63b30..0000000 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/GenerateReportLogEntry.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.gcube.portlets.user.reportgenerator.server.servlet.loggers; - -import org.gcube.application.framework.accesslogger.model.AccessLogEntry; - -/** - * Represents an access log entry for creating a new Template - */ -public class GenerateReportLogEntry extends AccessLogEntry{ - - private String name; - - private String mimetype; - - private String type; - - public GenerateReportLogEntry(String name, String mimetype, String type) { - super("Generate_Report_Output"); - this.name = replaceReservedChars(name); - this.mimetype = replaceReservedChars(mimetype); - } - - @Override - public String getLogMessage() { - String message = "Name = " + name + "|MIMETYPE = " + mimetype+ "|TYPE = " + type; - return message; - } - -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenReportLogEntry.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenReportLogEntry.java deleted file mode 100644 index 0e661ac..0000000 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenReportLogEntry.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.gcube.portlets.user.reportgenerator.server.servlet.loggers; - -import org.gcube.application.framework.accesslogger.model.AccessLogEntry; - - -/** - * Represents an access log entry for creating a new Template - */ -public class OpenReportLogEntry extends AccessLogEntry{ - - private String templateName; - - private String templateId; - - public OpenReportLogEntry(String templateName, String templateId) { - super("Open_Report"); - this.templateName = replaceReservedChars(templateName); - this.templateId = replaceReservedChars(templateId); - } - - @Override - public String getLogMessage() { - String message = "Name = " + templateName + "|ID = " + templateId; - return message; - } - -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenWorkflowLogEntry.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenWorkflowLogEntry.java deleted file mode 100644 index 9693eee..0000000 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenWorkflowLogEntry.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.gcube.portlets.user.reportgenerator.server.servlet.loggers; - -import org.gcube.application.framework.accesslogger.model.AccessLogEntry; - - -/** - * Represents an access log entry for creating a new Template - */ -public class OpenWorkflowLogEntry extends AccessLogEntry{ - - private String templateName; - private String author; - private String templateId; - - public OpenWorkflowLogEntry(String templateName, String templateId, String author) { - super("Open_Workflow_Report"); - this.author = author; - this.templateName = replaceReservedChars(templateName); - this.templateId = replaceReservedChars(templateId); - } - - @Override - public String getLogMessage() { - String message = "Name = " + templateName + "|ID = " + templateId+ "|AUTHOR = " + author; - return message; - } - -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/SaveWorkflowLogEntry.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/SaveWorkflowLogEntry.java deleted file mode 100644 index 7fcefad..0000000 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/SaveWorkflowLogEntry.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.gcube.portlets.user.reportgenerator.server.servlet.loggers; - -import org.gcube.application.framework.accesslogger.model.AccessLogEntry; - - -/** - * Represents an access log entry for creating a new Template - */ -public class SaveWorkflowLogEntry extends AccessLogEntry{ - - private String templateName; - private String author; - private String templateId; - - public SaveWorkflowLogEntry(String templateName, String templateId, String author) { - super("Save_Workflow_Report"); - this.author = author; - this.templateName = replaceReservedChars(templateName); - this.templateId = replaceReservedChars(templateId); - } - - @Override - public String getLogMessage() { - String message = "Name = " + templateName + "|ID = " + templateId+ "|AUTHOR = " + author; - return message; - } - -} \ No newline at end of file