gCubeSystem
/
vmereports-manager-portlet
Archived
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed dependency towards access logger

Browse Source 
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@142372 82a268e6-3cf1-43bd-a215-b396298e98cf
master
Massimiliano Assante 7 years ago
parent 006abb0cda
commit e9972d4742
10 changed files with 14 additions and 161 deletions
Show Stats Download Patch File Download Diff File

6
.classpath
Unescape Escape View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/reports-manager-portlet-6.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/reports-manager-portlet-6.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/reports-manager-portlet-6.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/reports-manager-portlet-6.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -39,5 +39,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/reports-manager-portlet-6.0.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/reports-manager-portlet-6.1.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

3
.settings/org.eclipse.wst.common.component
Unescape Escape View File

@ -5,8 +5,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<dependent-module archiveName="session-checker-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/session-checker/session-checker">
<dependent-module archiveName="session-checker-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/session-checker/session-checker">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="gcube-reporting-library-3.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-reporting-library/gcube-reporting-library">

4
distro/changelog.xml
Unescape Escape View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.report-generator-portlet.6-1-0"
date="2017-01-29">
<Change>Removed dependency towards access logger</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.report-generator-portlet.6-0-0"
date="2016-06-29">
<Change>Ported to Liferay 6.2</Change>

7
pom.xml
Unescape Escape View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>reports-manager-portlet</artifactId>
<packaging>war</packaging>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<name>gCube Reports Manager</name>
<description>
gCube Reports Portlet.
@ -214,11 +214,6 @@
<artifactId>home-library-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>accesslogger</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>

18
src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
Unescape Escape View File

@ -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);

26
src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/CreateReportLogEntry.java
Unescape Escape View File

@ -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;
}
}

28
src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/GenerateReportLogEntry.java
Unescape Escape View File

@ -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;
}
}

27
src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenReportLogEntry.java
Unescape Escape View File

@ -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;
}
}

28
src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/OpenWorkflowLogEntry.java
Unescape Escape View File

@ -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;
}
}

28
src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/loggers/SaveWorkflowLogEntry.java
Unescape Escape View File

@ -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;
}
}