Author: norman
Date: Fri Jul 31 13:12:28 2009
New Revision: 799597
URL: http://svn.apache.org/viewvc?rev=799597&view=rev
Log:
Logout if an invalid session is used
Added:
labs/hupa/src/main/java/org/apache/hupa/client/MyAsyncCallback.java
labs/hupa/src/main/java/org/apache/hupa/shared/exception/
labs/hupa/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
Added: labs/hupa/src/main/java/org/apache/hupa/client/MyAsyncCallback.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/MyAsyncCallback.java?rev=799597&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/MyAsyncCallback.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/client/MyAsyncCallback.java Fri Jul
31 13:12:28 2009
@@ -0,0 +1,48 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.hupa.client;
+
+import net.customware.gwt.presenter.client.EventBus;
+
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.events.LogoutEvent;
+import org.apache.hupa.shared.exception.InvalidSessionException;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public abstract class MyAsyncCallback<T> implements AsyncCallback<T>{
+
+ private EventBus bus;
+ private User user;
+
+ public MyAsyncCallback(EventBus bus,User user) {
+ this.bus = bus;
+ this.user = user;
+ }
+
+ public void onFailure(Throwable caught) {
+ if (caught instanceof InvalidSessionException) {
+ bus.fireEvent(new LogoutEvent(user));
+ }
+ GWT.log("Error while executing remote service", caught);
+ }
+
+}
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java?rev=799597&r1=799596&r2=799597&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
Fri Jul 31 13:12:28 2009
@@ -28,6 +28,7 @@
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+import org.apache.hupa.client.MyAsyncCallback;
import org.apache.hupa.client.events.ClickEvent;
import org.apache.hupa.client.events.ClickHandler;
import org.apache.hupa.client.events.HasClickHandlers;
@@ -47,7 +48,6 @@
import com.google.gwt.gen2.table.event.client.HasPageLoadHandlers;
import com.google.gwt.gen2.table.event.client.HasRowSelectionHandlers;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.inject.Inject;
public class IMAPMessageListPresenter extends
WidgetPresenter<IMAPMessageListPresenter.Display>{
@@ -124,12 +124,7 @@
display.getDeleteClick().addClickHandler(new
com.google.gwt.event.dom.client.ClickHandler() {
public void
onClick(com.google.gwt.event.dom.client.ClickEvent event) {
- dispatcher.execute(new
DeleteMessage(user.getSessionId(),folder,display.getSelectedMessagesUids()),
new AsyncCallback<DeleteMessageResult>() {
-
- public void onFailure(Throwable caught)
{
- // TODO Auto-generated method
stub
-
- }
+ dispatcher.execute(new
DeleteMessage(user.getSessionId(),folder,display.getSelectedMessagesUids()),
new MyAsyncCallback<DeleteMessageResult>(eventBus,user) {
public void
onSuccess(DeleteMessageResult result) {
display.removeMessages(result.getMessageUids());
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java?rev=799597&r1=799596&r2=799597&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
Fri Jul 31 13:12:28 2009
@@ -29,6 +29,7 @@
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+import org.apache.hupa.client.MyAsyncCallback;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
import org.apache.hupa.shared.data.MessageAttachment;
@@ -40,7 +41,6 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasHTML;
import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
@@ -123,12 +123,7 @@
public void onClick(ClickEvent event) {
ArrayList<Long> uidList = new ArrayList<Long>();
uidList.add(message.getUid());
- dispatcher.execute(new
DeleteMessage(user.getSessionId(),folder,uidList), new
AsyncCallback<DeleteMessageResult>() {
-
- public void onFailure(Throwable caught)
{
- // TODO Auto-generated method
stub
-
- }
+ dispatcher.execute(new
DeleteMessage(user.getSessionId(),folder,uidList), new
MyAsyncCallback<DeleteMessageResult>(eventBus,user) {
public void
onSuccess(DeleteMessageResult result) {
eventBus.fireEvent(new
LoadMessagesEvent(user,folder));
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java?rev=799597&r1=799596&r2=799597&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java Fri
Jul 31 13:12:28 2009
@@ -23,7 +23,6 @@
import net.customware.gwt.presenter.client.EventBus;
import net.customware.gwt.presenter.client.place.Place;
import net.customware.gwt.presenter.client.place.PlaceRequest;
-import net.customware.gwt.presenter.client.place.PlaceRequestEvent;
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
@@ -36,7 +35,6 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.user.client.History;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasText;
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=799597&r1=799596&r2=799597&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java Fri
Jul 31 13:12:28 2009
@@ -31,6 +31,7 @@
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+import org.apache.hupa.client.MyAsyncCallback;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
@@ -108,11 +109,7 @@
protected void loadTreeItems() {
- dispatcher.execute(new FetchFolders(user.getSessionId()), new
AsyncCallback<FetchFoldersResult>() {
-
- public void onFailure(Throwable caught) {
- System.err.println("T="+ caught);
- }
+ dispatcher.execute(new FetchFolders(user.getSessionId()), new
MyAsyncCallback<FetchFoldersResult>(eventBus,user) {
public void onSuccess(FetchFoldersResult result) {
display.bindTreeItems(createTreeNodes(result.getFolders()));
@@ -244,11 +241,8 @@
} else {
decreaseUnseen = false;
}
- dispatcher.execute(new
ExposeMessage(event.getUser().getSessionId(),event.getFolder(),event.getMessage()),
new AsyncCallback<ExposeMessageResult>() {
+ dispatcher.execute(new
ExposeMessage(event.getUser().getSessionId(),event.getFolder(),event.getMessage()),
new MyAsyncCallback<ExposeMessageResult>(eventBus,user) {
- public void onFailure(Throwable caught)
{
- GWT.log("ERROR=", caught);
- }
public void
onSuccess(ExposeMessageResult result) {
// decrease the unseen count if
we were able to expose the message
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=799597&r1=799596&r2=799597&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
Fri Jul 31 13:12:28 2009
@@ -31,6 +31,7 @@
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+import org.apache.hupa.client.MyAsyncCallback;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageContent;
@@ -49,7 +50,6 @@
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
@@ -145,11 +145,7 @@
content.setMessageAttachments(aList);
message.setHeader(header);
message.setMessageContent(content);
- dispatcher.execute(new
SendMessage(user.getSessionId(),message), new AsyncCallback<EmptyResult>() {
-
- public void onFailure(Throwable
caught) {
-
- }
+ dispatcher.execute(new
SendMessage(user.getSessionId(),message), new
MyAsyncCallback<EmptyResult>(eventBus,user) {
public void
onSuccess(EmptyResult result) {
reset();
Modified:
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java?rev=799597&r1=799596&r2=799597&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
Fri Jul 31 13:12:28 2009
@@ -25,6 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.exception.InvalidSessionException;
import org.apache.hupa.shared.rpc.Session;
import com.google.inject.Inject;
@@ -59,7 +60,7 @@
if (isValidSession(action.getSessionId())) {
return executeInternal(action, context);
} else {
- throw new ActionException("Invalid SessionId="
+action.getSessionId());
+ throw new InvalidSessionException("Invalid SessionId="
+action.getSessionId());
}
}
@@ -93,7 +94,7 @@
protected User getUser(String sessionId) throws ActionException{
User user = (User) sessionProvider.get().getAttribute("user");
if (user == null) {
- throw new ActionException("User not found in session
with id " + sessionId);
+ throw new InvalidSessionException("User not found in
session with id " + sessionId);
} else {
return user;
}
Added:
labs/hupa/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java?rev=799597&view=auto
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
(added)
+++
labs/hupa/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
Fri Jul 31 13:12:28 2009
@@ -0,0 +1,37 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.hupa.shared.exception;
+
+import net.customware.gwt.dispatch.shared.ActionException;
+
+/**
+ *
+ */
+public class InvalidSessionException extends ActionException{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 995112620968798947L;
+
+ public InvalidSessionException(String msg) {
+ super(msg);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
