diff --git a/distro/changelog.xml b/distro/changelog.xml index b7c0a9c..ab12bbf 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + Updated to PortalContext [issue #6548] + Updated i18N support diff --git a/pom.xml b/pom.xml index 447eecd..a0b5c91 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-mainbox-widget - 1.4.0-SNAPSHOT + 1.5.0-SNAPSHOT tabular-data-mainbox-widget tabular-data-mainbox-widget implements a tab panel to shows resources and table @@ -105,8 +105,6 @@ - - org.gcube.core @@ -115,22 +113,17 @@ - org.gcube.portal - custom-portal-handler + org.gcube.common.portal + portal-manager provided - org.gcube.applicationsupportlayer - aslcore - provided - - - - org.gcube.applicationsupportlayer - accesslogger + org.gcube.dvos + usermanagement-core provided + diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java index 47fcd22..a36007a 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java @@ -5,11 +5,11 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it * */ @RemoteServiceRelativePath("tds") public interface TabularDataService extends RemoteService { - String hello() throws IllegalArgumentException; + String hello() throws Exception; } diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java index 2c98c35..7779ab0 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java @@ -1,12 +1,10 @@ package org.gcube.portlets.user.td.mainboxwidget.server; import javax.servlet.ServletException; -import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; -import org.gcube.application.framework.core.session.ASLSession; -import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; -import org.gcube.portlets.user.td.gwtservice.shared.Constants; +import org.gcube.portlets.user.td.gwtservice.server.SessionUtil; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; import org.gcube.portlets.user.td.mainboxwidget.client.rpc.TabularDataService; import org.gcube.portlets.user.tdwx.datasource.td.TDXDataSourceFactory; import org.gcube.portlets.user.tdwx.server.datasource.DataSourceXFactoryRegistry; @@ -15,17 +13,19 @@ import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; - /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author giancarlo email: g.panichi@isti.cnr.it * */ @SuppressWarnings("serial") -public class TabularDataServiceImpl extends RemoteServiceServlet implements TabularDataService { +public class TabularDataServiceImpl extends RemoteServiceServlet implements + TabularDataService { + + protected static Logger logger = LoggerFactory + .getLogger(TabularDataServiceImpl.class); - protected static Logger logger = LoggerFactory.getLogger(TabularDataServiceImpl.class); /** * {@inheritDoc} */ @@ -33,62 +33,45 @@ public class TabularDataServiceImpl extends RemoteServiceServlet implements Tabu public void init() throws ServletException { super.init(); - /*System.out.println("initializing the TabularDataImportManager"); - TabularDataImporterManager importerManager = new TabularDataImporterManager(); - //importerManager.scanAvailableImporters(); - importerManager.add(new CSVTDImporter()); - importerManager.setupImporters(); + /* + * System.out.println("initializing the TabularDataImportManager"); + * TabularDataImporterManager importerManager = new + * TabularDataImporterManager(); + * //importerManager.scanAvailableImporters(); importerManager.add(new + * CSVTDImporter()); importerManager.setupImporters(); */ - //register the demo csv target - //CSVTargetRegistry.getInstance().add(new DemoCSVTarget()); - //System.out.println("Registered DemoCSVTarget"); + // register the demo csv target + // CSVTargetRegistry.getInstance().add(new DemoCSVTarget()); + // System.out.println("Registered DemoCSVTarget"); - //ScopeProvider.instance.get(); + // ScopeProvider.instance.get(); System.out.println("Fix JAXP: jdk.xml.entityExpansionLimit=0"); System.setProperty("jdk.xml.entityExpansionLimit", "0"); - + System.out.println("initializing TDXDataSourceFactory"); - DataSourceXFactoryRegistry.getInstance().add(new TDXDataSourceFactory()); + DataSourceXFactoryRegistry.getInstance() + .add(new TDXDataSourceFactory()); } - - protected static ASLSession getAslSession(HttpSession httpSession) - { - String username = (String) httpSession - .getAttribute(ScopeHelper.USERNAME_ATTRIBUTE); - ASLSession session; - if (username == null) { - logger.warn("no user found in session, using test one"); - /*throw new Exception("Session Expired!");*/ - // Remove comment for Test - - username = Constants.DEFAULT_USER; - String scope = Constants.DEFAULT_SCOPE; - httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username); - session = SessionManager.getInstance().getASLSession( - httpSession.getId(), username); - session.setScope(scope); - - } else { - session = SessionManager.getInstance().getASLSession( - httpSession.getId(), username); - - } - - logger.info("SessionUtil: aslSession " + session.getUsername() + " " - + session.getScope()); - - return session; - - } - /** * {@inheritDoc} */ - public String hello() throws IllegalArgumentException { - ASLSession aslSession=getAslSession(this.getThreadLocalRequest().getSession()); - return "Hello "+aslSession.getUsername(); + @Override + public String hello() throws Exception { + HttpServletRequest httpRequest = null; + try { + httpRequest = this.getThreadLocalRequest(); + ServiceCredentials serviceCredentials = SessionUtil + .getServiceCredentials(httpRequest); + logger.debug("hello()"); + + return "Hello " + serviceCredentials.getUserName(); + } catch (Throwable e) { + logger.error("Hello(): " + e.getLocalizedMessage(), e); + throw new Exception(e.getLocalizedMessage()); + } + } }