removed session checker ported to client context, removed ASL
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@134102 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
c1726e2f26
commit
5e210a9056
|
@ -8,9 +8,6 @@
|
||||||
<dependent-module archiveName="gcube-widgets-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
|
<dependent-module archiveName="gcube-widgets-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
|
||||||
<dependency-type>uses</dependency-type>
|
<dependency-type>uses</dependency-type>
|
||||||
</dependent-module>
|
</dependent-module>
|
||||||
<dependent-module archiveName="session-checker-2.0.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="news-feed"/>
|
<property name="context-root" value="news-feed"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
5
pom.xml
5
pom.xml
|
@ -147,11 +147,6 @@
|
||||||
<artifactId>social-data-search-client</artifactId>
|
<artifactId>social-data-search-client</artifactId>
|
||||||
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
|
||||||
<artifactId>session-checker</artifactId>
|
|
||||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
<groupId>org.gcube.portlets.widgets</groupId>
|
||||||
<artifactId>pickitem-widget</artifactId>
|
<artifactId>pickitem-widget</artifactId>
|
||||||
|
|
|
@ -4,8 +4,6 @@ import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapterException;
|
|
||||||
|
|
||||||
import org.gcube.common.portal.GCubePortalConstants;
|
import org.gcube.common.portal.GCubePortalConstants;
|
||||||
import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
||||||
import org.gcube.portal.databook.client.util.Encoder;
|
import org.gcube.portal.databook.client.util.Encoder;
|
||||||
|
@ -58,7 +56,6 @@ import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
||||||
import org.gcube.portlets.widgets.sessionchecker.client.CheckSession;
|
|
||||||
import org.gcube.portlets.widgets.userselection.client.UserSelectionDialog;
|
import org.gcube.portlets.widgets.userselection.client.UserSelectionDialog;
|
||||||
import org.gcube.portlets.widgets.userselection.client.events.SelectedUserEvent;
|
import org.gcube.portlets.widgets.userselection.client.events.SelectedUserEvent;
|
||||||
import org.gcube.portlets.widgets.userselection.client.events.SelectedUserEventHandler;
|
import org.gcube.portlets.widgets.userselection.client.events.SelectedUserEventHandler;
|
||||||
|
@ -68,7 +65,6 @@ import org.jsonmaker.gwt.client.base.Defaults;
|
||||||
|
|
||||||
import com.github.gwtbootstrap.client.ui.Row;
|
import com.github.gwtbootstrap.client.ui.Row;
|
||||||
import com.google.gwt.core.client.GWT;
|
import com.google.gwt.core.client.GWT;
|
||||||
import com.google.gwt.core.client.RunAsyncCallback;
|
|
||||||
import com.google.gwt.dom.client.Document;
|
import com.google.gwt.dom.client.Document;
|
||||||
import com.google.gwt.dom.client.Style.Unit;
|
import com.google.gwt.dom.client.Style.Unit;
|
||||||
import com.google.gwt.event.shared.HandlerManager;
|
import com.google.gwt.event.shared.HandlerManager;
|
||||||
|
@ -88,6 +84,8 @@ import com.google.gwt.user.client.ui.Image;
|
||||||
import com.google.gwt.user.client.ui.SimplePanel;
|
import com.google.gwt.user.client.ui.SimplePanel;
|
||||||
import com.google.gwt.user.client.ui.VerticalPanel;
|
import com.google.gwt.user.client.ui.VerticalPanel;
|
||||||
import com.google.gwt.user.client.ui.Widget;
|
import com.google.gwt.user.client.ui.Widget;
|
||||||
|
|
||||||
|
import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapterException;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Massimiliano Assante, ISTI-CNR
|
* @author Massimiliano Assante, ISTI-CNR
|
||||||
|
@ -277,7 +275,7 @@ public class NewsFeedPanel extends Composite {
|
||||||
newsPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP);
|
newsPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP);
|
||||||
loadingImage = new Image(loading);
|
loadingImage = new Image(loading);
|
||||||
newsPanel.add(loadingIcon);
|
newsPanel.add(loadingIcon);
|
||||||
CheckSession.getInstance().startPolling();
|
//CheckSession.getInstance().startPolling();
|
||||||
isSearch = false;
|
isSearch = false;
|
||||||
isFeedsRelatedToStatistics = false;
|
isFeedsRelatedToStatistics = false;
|
||||||
|
|
||||||
|
@ -1276,15 +1274,7 @@ public class NewsFeedPanel extends Composite {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doShowSessionExpired() {
|
private void doShowSessionExpired() {
|
||||||
GWT.runAsync(UserSelectionDialog.class, new RunAsyncCallback() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess() {
|
|
||||||
CheckSession.showLogoutDialog();
|
|
||||||
}
|
|
||||||
public void onFailure(Throwable reason) {
|
|
||||||
Window.alert("Could not load this component: " + reason.getMessage());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doShowLikes(final String feedId) {
|
private void doShowLikes(final String feedId) {
|
||||||
|
@ -1319,7 +1309,7 @@ public class NewsFeedPanel extends Composite {
|
||||||
public void onSuccess(OperationResult result) {
|
public void onSuccess(OperationResult result) {
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
if (!result.isSuccess()) {
|
if (!result.isSuccess()) {
|
||||||
CheckSession.showLogoutDialog();
|
//CheckSession.showLogoutDialog();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Comment comment = (Comment) result.getObject();
|
Comment comment = (Comment) result.getObject();
|
||||||
|
@ -1356,7 +1346,7 @@ public class NewsFeedPanel extends Composite {
|
||||||
public void onSuccess(OperationResult result) {
|
public void onSuccess(OperationResult result) {
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
if (!result.isSuccess()) {
|
if (!result.isSuccess()) {
|
||||||
CheckSession.showLogoutDialog();
|
//CheckSession.showLogoutDialog();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Comment comment = (Comment) result.getObject();
|
Comment comment = (Comment) result.getObject();
|
||||||
|
|
|
@ -15,26 +15,6 @@
|
||||||
<url-pattern>/newsfeed/newsServlet</url-pattern>
|
<url-pattern>/newsfeed/newsServlet</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
<servlet>
|
|
||||||
<servlet-name>scopeService</servlet-name>
|
|
||||||
<servlet-class>org.gcube.portlets.user.gcubewidgets.server.ScopeServiceImpl</servlet-class>
|
|
||||||
</servlet>
|
|
||||||
|
|
||||||
<servlet-mapping>
|
|
||||||
<servlet-name>scopeService</servlet-name>
|
|
||||||
<url-pattern>/newsfeed/scopeService</url-pattern>
|
|
||||||
</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>/newsfeed/checksession</url-pattern>
|
|
||||||
</servlet-mapping>
|
|
||||||
|
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>imageservices</servlet-name>
|
<servlet-name>imageservices</servlet-name>
|
||||||
<servlet-class>org.gcube.portlets.widgets.imagepreviewerwidget.server.ImageOrientationServicesImpl</servlet-class>
|
<servlet-class>org.gcube.portlets.widgets.imagepreviewerwidget.server.ImageOrientationServicesImpl</servlet-class>
|
||||||
|
|
Loading…
Reference in New Issue