Bug #1829 Reports Manager setting dev mode when session expires to any user
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@121844 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
0fed8058e2
commit
1ba9552677
|
@ -4,6 +4,9 @@
|
||||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
<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/java"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
||||||
|
<dependent-module archiveName="session-checker-0.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/session-checker/session-checker">
|
||||||
|
<dependency-type>uses</dependency-type>
|
||||||
|
</dependent-module>
|
||||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||||
<property name="context-root" value="reports"/>
|
<property name="context-root" value="reports"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<Changeset component="org.gcube.portlets-user.report-generator-portlet.5-1-0"
|
<Changeset component="org.gcube.portlets-user.report-generator-portlet.5-1-0"
|
||||||
date="2015-12-11">
|
date="2015-12-11">
|
||||||
<Change>Fix for Incident #1511 - deactivating window.alert deactivates commit facility - Need for internal dialog</Change>
|
<Change>Fix for Incident #1511 - deactivating window.alert deactivates commit facility - Need for internal dialog</Change>
|
||||||
|
<Change>Fix for Incident #1828 - Reports Manager of production contacting the dev RSG Webservice</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets-user.report-generator-portlet.5-0-0"
|
<Changeset component="org.gcube.portlets-user.report-generator-portlet.5-0-0"
|
||||||
date="2015-09-29">
|
date="2015-09-29">
|
||||||
|
|
5
pom.xml
5
pom.xml
|
@ -85,6 +85,11 @@
|
||||||
<version>${gwtVersion}</version>
|
<version>${gwtVersion}</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gcube.portlets.widgets</groupId>
|
||||||
|
<artifactId>session-checker</artifactId>
|
||||||
|
<version>[0.4.0-SNAPSHOT, 1.0.0-SNAPSHOT)</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.core</groupId>
|
<groupId>org.gcube.core</groupId>
|
||||||
<artifactId>common-scope-maps</artifactId>
|
<artifactId>common-scope-maps</artifactId>
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.portlets.user.reportgenerator.client;
|
package org.gcube.portlets.user.reportgenerator.client;
|
||||||
|
|
||||||
import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
|
import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
|
||||||
|
import org.gcube.portlets.widgets.sessionchecker.client.CheckSession;
|
||||||
|
|
||||||
import com.google.gwt.core.client.EntryPoint;
|
import com.google.gwt.core.client.EntryPoint;
|
||||||
import com.google.gwt.user.client.ui.CellPanel;
|
import com.google.gwt.user.client.ui.CellPanel;
|
||||||
|
@ -128,6 +129,8 @@ public class ReportGenerator implements EntryPoint {
|
||||||
|
|
||||||
// Add image and button to the RootPanel
|
// Add image and button to the RootPanel
|
||||||
RootPanel.get("ReportGeneratorDIV").add(mainLayout);
|
RootPanel.get("ReportGeneratorDIV").add(mainLayout);
|
||||||
|
//if you do not need to something when the session expire
|
||||||
|
CheckSession.getInstance().startPolling();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1947,6 +1947,11 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
private boolean isReportsStoreGatewayAvailable(){
|
private boolean isReportsStoreGatewayAvailable(){
|
||||||
|
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
|
||||||
|
if (user == null && isWithinPortal()) {
|
||||||
|
_log.warn("Session expired, returning ReportsStoreGateway not available");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
String scope = getASLSession().getScope();
|
String scope = getASLSession().getScope();
|
||||||
_log.info("Looking for a running ReportsStoreGateway WS in " + scope);
|
_log.info("Looking for a running ReportsStoreGateway WS in " + scope);
|
||||||
String previousScope = ScopeProvider.instance.get();
|
String previousScope = ScopeProvider.instance.get();
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
<inherits name='com.extjs.gxt.ui.GXT' />
|
<inherits name='com.extjs.gxt.ui.GXT' />
|
||||||
<inherits name='org.gcube.portlets.widgets.fileupload.FileUpload' />
|
<inherits name='org.gcube.portlets.widgets.fileupload.FileUpload' />
|
||||||
<inherits name='org.gcube.portlets.widgets.exporter.Report_exporter_widget' />
|
<inherits name='org.gcube.portlets.widgets.exporter.Report_exporter_widget' />
|
||||||
|
<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
|
||||||
<!-- Specify the app entry point class. -->
|
<!-- Specify the app entry point class. -->
|
||||||
<entry-point
|
<entry-point
|
||||||
class='org.gcube.portlets.user.reportgenerator.client.ReportGenerator' />
|
class='org.gcube.portlets.user.reportgenerator.client.ReportGenerator' />
|
||||||
|
|
|
@ -24,6 +24,16 @@
|
||||||
<url-pattern>/reports/WorkspaceExplorerService</url-pattern>
|
<url-pattern>/reports/WorkspaceExplorerService</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>checkServlet</servlet-name>
|
||||||
|
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
|
||||||
|
</servlet>
|
||||||
|
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>checkServlet</servlet-name>
|
||||||
|
<url-pattern>/reports/checksession</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
|
||||||
|
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>uploadprogress</servlet-name>
|
<servlet-name>uploadprogress</servlet-name>
|
||||||
|
|
Reference in New Issue