refs:4408: org.gcube.portlets-user.tabular-data-expression-widget.1-8-0

https://support.d4science.org/issues/4408

Updated to Liferay 6.2

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@129382 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-expression-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-expression-widget-1.8.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/tabular-data-expression-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-expression-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -32,5 +32,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/tabular-data-expression-widget-1.7.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-expression-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.settings/org.eclipse.wst.common.component

@@ -4,7 +4,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="java-output-path" value="/tabular-data-expression-widget/target/tabular-data-expression-widget-1.0.0-SNAPSHOT/WEB-INF/classes"/>
+        <property name="java-output-path" value="/tabular-data-expression-widget/target/tabular-data-expression-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/>
         <property name="context-root" value="tabular-data-expression-widget"/>
     </wb-module>
 </project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,5 +4,4 @@
   <installed facet="jst.web" version="2.3"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.7"/>
-  <installed facet="jst.jaxrs" version="2.0"/>
 </faceted-project>

distro/changelog.xml

@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-expression-widget.1-8-0"
+		date="2016-07-15">
+		<Change>Updated to Liferay 6.2</Change>
+	</Changeset>	
 	<Changeset component="org.gcube.portlets-user.tabular-data-expression-widget.1-7-0"
 		date="2015-07-03">
 		<Change>Fixel Layout</Change>

pom.xml

@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-expression-widget</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 
 
 	<name>tabular-data-expression-widget</name>

src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java

@@ -13,8 +13,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.data.analysis.tabulardata.expression.Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.exception.ExpressionParserException;
+import org.gcube.portlets.user.td.gwtservice.server.SessionUtil;
+import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,6 +63,17 @@ public class CExpressionMapServlet extends HttpServlet {
 		}
 		logger.info("CExpressionMapServlet import session id: "
 				+ session.getId());
+		
+		try {
+			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
+
+		} catch (TDGWTServiceException e) {
+			logger.error(e.getLocalizedMessage());
+			e.printStackTrace();
+			throw new ServletException(e.getLocalizedMessage());
+		}
 
 		ObjectInputStream in = new ObjectInputStream(request.getInputStream());
 		C_Expression exp=null;

src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java

@@ -254,7 +254,9 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
-
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
+			
 			logger.debug("GetRules()");
 			AuthorizationProvider.instance.set(new AuthorizationToken(
 					aslSession.getUsername(), aslSession.getScope()));
@@ -306,6 +308,8 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
 
 			logger.debug("GetRules(): " + scope);
 			AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -358,6 +362,8 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
 
 			logger.debug("GetApplicableBaseColumnRules(): " + columnData);
 			AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -428,6 +434,8 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
 
 			logger.debug("GetAppliedRulesByTabularResourceId(): " + trId);
 			AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -489,6 +497,8 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
 
 			logger.debug("SaveRule() :" + ruleDescriptionData);
 			AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -566,6 +576,8 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
 
 			logger.debug("UpdateColumnRule() :" + ruleDescriptionData);
 			AuthorizationProvider.instance.set(new AuthorizationToken(
@@ -617,6 +629,8 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
 		try {
 			session = this.getThreadLocalRequest().getSession();
 			ASLSession aslSession = SessionUtil.getAslSession(session);
+			String token = SessionUtil.getToken(aslSession);
+			logger.debug("UserToken: " + token);
 
 			logger.debug("RemoveRuleById() :" + rules);
 			if (rules == null || !(rules.size() > 0)) {