You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by no...@apache.org on 2009/07/29 12:40:32 UTC
svn commit: r798850 - in /labs/hupa/src/main/java/org/apache/hupa:
client/mvp/ server/ server/guice/ shared/data/ shared/rpc/
Author: norman
Date: Wed Jul 29 10:40:29 2009
New Revision: 798850
URL: http://svn.apache.org/viewvc?rev=798850&view=rev
Log:
Use sessions and cookies
Added:
labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/guice/HttpSessionProvider.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginSession.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Session.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.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/DeleteMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java Wed Jul 29 10:40:29 2009
@@ -28,10 +28,13 @@
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
+import org.apache.hupa.shared.rpc.LoginSession;
+import org.apache.hupa.shared.rpc.LoginUserResult;
import org.apache.hupa.shared.rpc.Noop;
import org.apache.hupa.shared.rpc.NoopResult;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasWidgets;
@@ -63,11 +66,12 @@
public void onLogin(LoginEvent event) {
user = event.getUser();
+ Cookies.setCookie("sessionId", user.getSessionId());
noopTimer = new Timer() {
@Override
public void run() {
- dispatcher.execute(new Noop(user), new AsyncCallback<NoopResult>() {
+ dispatcher.execute(new Noop(user.getSessionId()), new AsyncCallback<NoopResult>() {
public void onFailure(Throwable caught) {
GWT.log("Error while NOOP", caught);
@@ -87,6 +91,7 @@
bus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() {
public void onLogout(LogoutEvent event) {
+ Cookies.removeCookie("sessionId");
showLogin();
if (noopTimer != null) {
noopTimer.cancel();
@@ -110,6 +115,24 @@
public void go(HasWidgets container) {
this.container = container;
- showLogin();
+ String sessionId = Cookies.getCookie("sessionId");
+ if (sessionId != null) {
+ dispatcher.execute(new LoginSession(sessionId), new AsyncCallback<LoginUserResult>() {
+
+ public void onFailure(Throwable caught) {
+ // show login and remove cookie
+ Cookies.removeCookie("sessionId");
+ showLogin();
+
+ }
+
+ public void onSuccess(LoginUserResult result) {
+ bus.fireEvent(new LoginEvent(result.getUser()));
+ }
+
+ });
+ } else {
+ showLogin();
+ }
}
}
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=798850&r1=798849&r2=798850&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 Wed Jul 29 10:40:29 2009
@@ -124,7 +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,folder,display.getSelectedMessagesUids()), new AsyncCallback<DeleteMessageResult>() {
+ dispatcher.execute(new DeleteMessage(user.getSessionId(),folder,display.getSelectedMessagesUids()), new AsyncCallback<DeleteMessageResult>() {
public void onFailure(Throwable caught) {
// TODO Auto-generated method stub
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java Wed Jul 29 10:40:29 2009
@@ -388,7 +388,7 @@
});
}
- dispatcher.execute(new FetchMessages(user,folder,request.getStartRow(),request.getNumRows(),searchValue), new AsyncCallback<FetchMessagesResult>() {
+ dispatcher.execute(new FetchMessages(user.getSessionId(),folder,request.getStartRow(),request.getNumRows(),searchValue), new AsyncCallback<FetchMessagesResult>() {
public void onFailure(Throwable caught) {
setRowCount(0);
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=798850&r1=798849&r2=798850&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 Wed Jul 29 10:40:29 2009
@@ -123,7 +123,7 @@
public void onClick(ClickEvent event) {
ArrayList<Long> uidList = new ArrayList<Long>();
uidList.add(message.getUid());
- dispatcher.execute(new DeleteMessage(user,folder,uidList), new AsyncCallback<DeleteMessageResult>() {
+ dispatcher.execute(new DeleteMessage(user.getSessionId(),folder,uidList), new AsyncCallback<DeleteMessageResult>() {
public void onFailure(Throwable caught) {
// TODO Auto-generated method stub
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=798850&r1=798849&r2=798850&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 Wed Jul 29 10:40:29 2009
@@ -108,7 +108,7 @@
protected void loadTreeItems() {
- dispatcher.execute(new FetchFolders(user), new AsyncCallback<FetchFoldersResult>() {
+ dispatcher.execute(new FetchFolders(user.getSessionId()), new AsyncCallback<FetchFoldersResult>() {
public void onFailure(Throwable caught) {
System.err.println("T="+ caught);
@@ -167,7 +167,7 @@
private void doLogout() {
if (user != null) {
- dispatcher.execute(new LogoutUser(user), new AsyncCallback<LogoutUserResult>() {
+ dispatcher.execute(new LogoutUser(user.getSessionId()), new AsyncCallback<LogoutUserResult>() {
public void onFailure(Throwable caught) {
GWT.log("ERROR",caught);
@@ -244,7 +244,7 @@
} else {
decreaseUnseen = false;
}
- dispatcher.execute(new ExposeMessage(event.getUser(),event.getFolder(),event.getMessage()), new AsyncCallback<ExposeMessageResult>() {
+ dispatcher.execute(new ExposeMessage(event.getUser().getSessionId(),event.getFolder(),event.getMessage()), new AsyncCallback<ExposeMessageResult>() {
public void onFailure(Throwable caught) {
GWT.log("ERROR=", caught);
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=798850&r1=798849&r2=798850&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 Wed Jul 29 10:40:29 2009
@@ -145,7 +145,7 @@
content.setMessageAttachments(aList);
message.setHeader(header);
message.setMessageContent(content);
- dispatcher.execute(new SendMessage(user,message), new AsyncCallback<EmptyResult>() {
+ dispatcher.execute(new SendMessage(user.getSessionId(),message), new AsyncCallback<EmptyResult>() {
public void onFailure(Throwable caught) {
Added: labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java?rev=798850&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java Wed Jul 29 10:40:29 2009
@@ -0,0 +1,76 @@
+/****************************************************************
+ * 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.server;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.rpc.Session;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import net.customware.gwt.dispatch.server.ActionHandler;
+import net.customware.gwt.dispatch.server.ExecutionContext;
+import net.customware.gwt.dispatch.shared.ActionException;
+import net.customware.gwt.dispatch.shared.Result;
+
+public abstract class AbstractSessionHandler<A extends Session<R>,R extends Result> implements ActionHandler<A, R> {
+
+ protected Provider<HttpSession> sessionProvider;
+ protected IMAPStoreCache cache;
+ protected Log logger;
+
+ @Inject
+ public AbstractSessionHandler(IMAPStoreCache cache, Log logger, Provider<HttpSession> sessionProvider) {
+ this.sessionProvider = sessionProvider;
+ this.cache = cache;
+ this.logger = logger;
+ }
+
+ public R execute(A action, ExecutionContext context) throws ActionException {
+ if (isValidSession(action.getSessionId())) {
+ return executeInternal(action, context);
+ } else {
+ throw new ActionException("Invalid SessionId=" +action.getSessionId());
+ }
+ }
+
+
+ protected abstract R executeInternal(A action, ExecutionContext context) throws ActionException;
+
+ protected boolean isValidSession(String sessionId) {
+ if (sessionProvider.get().getId().equals(sessionId)) {
+ return true;
+ }
+ return false;
+ }
+
+ 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);
+ } else {
+ return user;
+ }
+ }
+}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java Wed Jul 29 10:40:29 2009
@@ -24,43 +24,39 @@
import javax.mail.Flags;
import javax.mail.Message;
+import javax.servlet.http.HttpSession;
-import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.logging.Log;
import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.sun.mail.imap.IMAPStore;
-public class DeleteMessageHandler implements ActionHandler<DeleteMessage, DeleteMessageResult>{
-
- private IMAPStoreCache cache;
- private Log logger;
+public class DeleteMessageHandler extends AbstractSessionHandler<DeleteMessage, DeleteMessageResult>{
@Inject
- public DeleteMessageHandler(IMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
+ public DeleteMessageHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> provider) {
+ super(cache,logger,provider);
}
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#execute(net.customware.gwt.dispatch.shared.Action, net.customware.gwt.dispatch.server.ExecutionContext)
- */
- public DeleteMessageResult execute(DeleteMessage action, ExecutionContext context)
+
+ public DeleteMessageResult executeInternal(DeleteMessage action, ExecutionContext context)
throws ActionException {
IMAPFolder folder = action.getFolder();
ArrayList<Long> uids = action.getMessageUids();
-
- logger.info("Deleting messages with uids "+ action.getMessageUids() + " for user " + action.getUser() + " in folder" + action.getFolder());
+ User user = getUser(action.getSessionId());
+
+ logger.info("Deleting messages with uids "+ action.getMessageUids() + " for user " + user + " in folder" + action.getFolder());
try {
- IMAPStore store = cache.get(action.getUser());
+ IMAPStore store = cache.get(user);
com.sun.mail.imap.IMAPFolder f = (com.sun.mail.imap.IMAPFolder)store.getFolder(folder.getFullName());
if (f.isOpen() == false) {
f.open(com.sun.mail.imap.IMAPFolder.READ_WRITE);
@@ -81,10 +77,10 @@
f.expunge(mArray);
f.close(false);
} catch (Exception e) {
- logger.error("Error while deleting messages with uids "+ action.getMessageUids() + " for user " + action.getUser() + " in folder" + action.getFolder(),e);
+ logger.error("Error while deleting messages with uids "+ action.getMessageUids() + " for user " + user + " in folder" + action.getFolder(),e);
throw new ActionException("Error while deleting messages",e);
}
- return new DeleteMessageResult(action.getUser(),folder,uids);
+ return new DeleteMessageResult(user,folder,uids);
}
/*
Modified: labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java Wed Jul 29 10:40:29 2009
@@ -28,8 +28,8 @@
import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;
+import javax.servlet.http.HttpSession;
-import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -44,21 +44,18 @@
import org.apache.hupa.shared.rpc.ExposeMessageResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.sun.mail.imap.IMAPStore;
-public class ExposeMessageHandler implements ActionHandler<ExposeMessage, ExposeMessageResult>{
-
- private IMAPStoreCache cache;
- private Log logger;
+public class ExposeMessageHandler extends AbstractSessionHandler<ExposeMessage, ExposeMessageResult>{
@Inject
- public ExposeMessageHandler(IMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
+ public ExposeMessageHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> sProvider) {
+ super(cache,logger,sProvider);
}
- public ExposeMessageResult execute(ExposeMessage action, ExecutionContext arg1)
+ public ExposeMessageResult executeInternal(ExposeMessage action, ExecutionContext arg1)
throws ActionException {
- return new ExposeMessageResult(exposeMessage(action.getUser(), action.getFolder(), action.getMessage()));
+ return new ExposeMessageResult(exposeMessage(getUser(action.getSessionId()), action.getFolder(), action.getMessage()));
}
public Class<ExposeMessage> getActionType() {
Modified: labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java Wed Jul 29 10:40:29 2009
@@ -23,8 +23,8 @@
import java.util.List;
import javax.mail.Folder;
+import javax.servlet.http.HttpSession;
-import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -35,22 +35,19 @@
import org.apache.hupa.shared.rpc.FetchFoldersResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.sun.mail.imap.IMAPStore;
-public class FetchFoldersHandler implements ActionHandler<FetchFolders, FetchFoldersResult>{
-
- private IMAPStoreCache cache;
- private Log logger;
+public class FetchFoldersHandler extends AbstractSessionHandler<FetchFolders, FetchFoldersResult>{
@Inject
- public FetchFoldersHandler(IMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
+ public FetchFoldersHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> provider) {
+ super(cache,logger,provider);
}
- public FetchFoldersResult execute(FetchFolders action, ExecutionContext arg1)
+ public FetchFoldersResult executeInternal(FetchFolders action, ExecutionContext arg1)
throws ActionException {
- return new FetchFoldersResult(getFolders(action.getUser()));
+ return new FetchFoldersResult(getFolders(getUser(action.getSessionId())));
}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java Wed Jul 29 10:40:29 2009
@@ -31,8 +31,8 @@
import javax.mail.internet.MimeMessage.RecipientType;
import javax.mail.search.BodyTerm;
import javax.mail.search.SearchTerm;
+import javax.servlet.http.HttpSession;
-import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -46,22 +46,19 @@
import org.apache.hupa.shared.rpc.FetchMessagesResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.sun.mail.imap.IMAPStore;
-public class FetchMessagesHandler implements ActionHandler<FetchMessages, FetchMessagesResult>{
-
-
- private IMAPStoreCache cache;
- private Log logger;
+public class FetchMessagesHandler extends AbstractSessionHandler<FetchMessages, FetchMessagesResult>{
@Inject
- public FetchMessagesHandler(IMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
+ public FetchMessagesHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> provider) {
+ super(cache,logger,provider);
}
- public FetchMessagesResult execute(FetchMessages action, ExecutionContext arg1)
+
+ public FetchMessagesResult executeInternal(FetchMessages action, ExecutionContext arg1)
throws ActionException {
- return getMessages(action.getUser(), action.getFolder(), action.getStart(), action.getOffset(), action.getSearchString());
+ return getMessages(getUser(action.getSessionId()), action.getFolder(), action.getStart(), action.getOffset(), action.getSearchString());
}
Added: labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java?rev=798850&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java Wed Jul 29 10:40:29 2009
@@ -0,0 +1,68 @@
+/****************************************************************
+ * 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.server;
+
+import javax.servlet.http.HttpSession;
+
+import net.customware.gwt.dispatch.server.ActionHandler;
+import net.customware.gwt.dispatch.server.ExecutionContext;
+import net.customware.gwt.dispatch.shared.ActionException;
+
+import org.apache.commons.logging.Log;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.rpc.LoginSession;
+import org.apache.hupa.shared.rpc.LoginUserResult;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class LoginSessionHandler implements ActionHandler<LoginSession, LoginUserResult>{
+
+ private Log logger;
+ private Provider<HttpSession> sessionProvider;
+
+ @Inject
+ public LoginSessionHandler(Log logger,
+ Provider<HttpSession> sessionProvider) {
+ this.logger = logger;
+ this.sessionProvider = sessionProvider;
+ }
+
+ public LoginUserResult execute(LoginSession action,
+ ExecutionContext context) throws ActionException {
+ HttpSession session = sessionProvider.get();
+ if (action.getSessionId().equals(session.getId())) {
+ User user = (User)sessionProvider.get().getAttribute("user");
+ return new LoginUserResult(user);
+ }
+ throw new ActionException("No user stored with the session " + action.getSessionId());
+ }
+
+ public Class<LoginSession> getActionType() {
+ return LoginSession.class;
+ }
+
+ public void rollback(LoginSession arg0, LoginUserResult arg1,
+ ExecutionContext arg2) throws ActionException {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java Wed Jul 29 10:40:29 2009
@@ -19,6 +19,8 @@
package org.apache.hupa.server;
+import javax.servlet.http.HttpSession;
+
import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -29,17 +31,20 @@
import org.apache.hupa.shared.rpc.LoginUserResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
public class LoginUserHandler implements
ActionHandler<LoginUser, LoginUserResult> {
private IMAPStoreCache cache;
private Log logger;
+ private Provider<HttpSession> sessionProvider;
@Inject
- public LoginUserHandler(IMAPStoreCache cache, Log logger) {
+ public LoginUserHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> sessionProvider) {
this.cache = cache;
this.logger = logger;
+ this.sessionProvider = sessionProvider;
}
public LoginUserResult execute(LoginUser action, ExecutionContext context)
@@ -68,6 +73,10 @@
cache.get(user);
user.setAuthenticated(true);
+
+ HttpSession session = sessionProvider.get();
+ user.setSessionId(session.getId());
+ session.setAttribute("user", user);
return user;
} catch (Exception e) {
Modified: labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java Wed Jul 29 10:40:29 2009
@@ -20,7 +20,8 @@
package org.apache.hupa.server;
-import net.customware.gwt.dispatch.server.ActionHandler;
+import javax.servlet.http.HttpSession;
+
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -30,22 +31,20 @@
import org.apache.hupa.shared.rpc.LogoutUserResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
-public class LogoutUserHandler implements ActionHandler<LogoutUser, LogoutUserResult> {
+public class LogoutUserHandler extends AbstractSessionHandler<LogoutUser, LogoutUserResult> {
+
- private IMAPStoreCache cache;
- private Log logger;
-
@Inject
- public LogoutUserHandler(IMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
+ public LogoutUserHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> provider) {
+ super(cache,logger,provider);
}
- public LogoutUserResult execute(LogoutUser action, ExecutionContext arg1)
+ public LogoutUserResult executeInternal(LogoutUser action, ExecutionContext arg1)
throws ActionException {
- User user = action.getUser();
+ User user = getUser(action.getSessionId());
user.setAuthenticated(false);
cache.delete(user);
Modified: labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java Wed Jul 29 10:40:29 2009
@@ -19,7 +19,8 @@
package org.apache.hupa.server;
-import net.customware.gwt.dispatch.server.ActionHandler;
+import javax.servlet.http.HttpSession;
+
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -28,25 +29,22 @@
import org.apache.hupa.shared.rpc.NoopResult;
import com.google.inject.Inject;
+import com.google.inject.Provider;
-public class NoopHandler implements ActionHandler<Noop, NoopResult>{
+public class NoopHandler extends AbstractSessionHandler<Noop, NoopResult>{
-
- private IMAPStoreCache cache;
- private Log logger;
@Inject
- public NoopHandler(IMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
+ public NoopHandler(IMAPStoreCache cache, Log logger,Provider<HttpSession> provider) {
+ super(cache,logger,provider);
}
- public NoopResult execute(Noop action, ExecutionContext context)
+ public NoopResult executeInternal(Noop action, ExecutionContext context)
throws ActionException {
try {
- cache.get(action.getUser()).idle();
+ cache.get(getUser(action.getSessionId())).idle();
return new NoopResult();
} catch (Exception e) {
- logger.error("Error while sending NOOP for user " + action.getUser(),e);
+ logger.error("Error while sending NOOP",e);
throw new ActionException("Unable to send NOOP");
}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java Wed Jul 29 10:40:29 2009
@@ -40,36 +40,36 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeMessage.RecipientType;
+import javax.servlet.http.HttpSession;
-import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.logging.Log;
import org.apache.hupa.shared.data.MessageAttachment;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.EmptyResult;
import org.apache.hupa.shared.rpc.SendMessage;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
-public class SendMessageHandler implements
- ActionHandler<SendMessage, EmptyResult> {
+public class SendMessageHandler extends AbstractSessionHandler<SendMessage, EmptyResult> {
private Log logger;
private FileItemRegistry registry;
private IMAPStoreCache store;
@Inject
- public SendMessageHandler(Log logger, FileItemRegistry registry,IMAPStoreCache store) {
- this.logger = logger;
+ public SendMessageHandler(Log logger, FileItemRegistry registry,IMAPStoreCache store, Provider<HttpSession> provider) {
+ super(store,logger,provider);
this.registry = registry;
- this.store = store;
}
- public EmptyResult execute(SendMessage action, ExecutionContext context)
+ public EmptyResult executeInternal(SendMessage action, ExecutionContext context)
throws ActionException {
try {
@@ -121,14 +121,14 @@
}
message.saveChanges();
-
+ User user = getUser(action.getSessionId());
Transport transport = session.getTransport("smtp");
- transport.connect("myblog.kicks-ass.org", 25, action.getUser()
- .getName(), action.getUser().getPassword());
+ transport.connect("myblog.kicks-ass.org", 25, user
+ .getName(), user.getPassword());
transport.sendMessage(message, message.getAllRecipients());
// store message in sent folder
- IMAPStore iStore = store.get(action.getUser());
+ IMAPStore iStore = store.get(user);
IMAPFolder folder = (IMAPFolder) iStore.getFolder(org.apache.hupa.shared.data.IMAPFolder.DEFAULT_SENT);
if (folder.exists() == false) {
folder.create(IMAPFolder.READ_WRITE);
Added: labs/hupa/src/main/java/org/apache/hupa/server/guice/HttpSessionProvider.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/guice/HttpSessionProvider.java?rev=798850&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/guice/HttpSessionProvider.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/server/guice/HttpSessionProvider.java Wed Jul 29 10:40:29 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.server.guice;
+
+import javax.servlet.http.HttpSession;
+
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+
+public class HttpSessionProvider implements Provider<HttpSession> {
+
+ private Injector injector;
+ public HttpSessionProvider(Injector injector) {
+ this.injector = injector;
+ }
+ public HttpSession get() {
+ return injector.getInstance(HttpSession.class);
+ }
+
+}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java Wed Jul 29 10:40:29 2009
@@ -28,6 +28,7 @@
import org.apache.hupa.server.FetchMessagesHandler;
import org.apache.hupa.server.FileItemRegistry;
import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.server.LoginSessionHandler;
import org.apache.hupa.server.LoginUserHandler;
import org.apache.hupa.server.LogoutUserHandler;
import org.apache.hupa.server.NoopHandler;
@@ -56,12 +57,12 @@
bindHandler(DeleteMessageHandler.class);
bindHandler(SendMessageHandler.class);
bindHandler(NoopHandler.class);
+ bindHandler(LoginSessionHandler.class);
bind(FileItemRegistry.class).in(Singleton.class);
bind(IMAPStoreCache.class).in(Singleton.class);
bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
bind(DownloadAttachmentServlet.class).in(Singleton.class);
- bind(UploadAttachmentServlet.class).in(Singleton.class);
-
+ bind(UploadAttachmentServlet.class).in(Singleton.class);
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java Wed Jul 29 10:40:29 2009
@@ -37,6 +37,7 @@
private String password;
private Date loginDate;
private boolean auth;
+ private String sessionId;
/**
@@ -125,6 +126,14 @@
public boolean getAuthenticated() {
return auth;
}
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java Wed Jul 29 10:40:29 2009
@@ -2,10 +2,7 @@
import java.util.ArrayList;
-import net.customware.gwt.dispatch.shared.Action;
-
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
@@ -26,28 +23,24 @@
* under the License. *
****************************************************************/
-public class DeleteMessage implements Action<DeleteMessageResult>{
+public class DeleteMessage extends Session<DeleteMessageResult>{
/**
*
*/
private static final long serialVersionUID = 801294103124082592L;
- private User user;
private IMAPFolder folder;
private ArrayList<Long> messageUids;
- @SuppressWarnings("unused")
- private DeleteMessage() {
-
- }
- public DeleteMessage(User user,IMAPFolder folder, ArrayList<Long> messageUids) {
- this.user = user;
+ public DeleteMessage(String sessionId,IMAPFolder folder, ArrayList<Long> messageUids) {
+ super(sessionId);
this.folder = folder;
this.messageUids = messageUids;
}
- public User getUser() {
- return user;
+ @SuppressWarnings("unused")
+ private DeleteMessage() {
+
}
public IMAPFolder getFolder() {
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java Wed Jul 29 10:40:29 2009
@@ -22,33 +22,24 @@
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.User;
-import net.customware.gwt.dispatch.shared.Action;
-
-public class ExposeMessage implements Action<ExposeMessageResult>{
+public class ExposeMessage extends Session<ExposeMessageResult>{
/**
*
*/
private static final long serialVersionUID = 5826298202494313834L;
- private User user;
private IMAPFolder folder;
private IMAPMessage message;
- @SuppressWarnings("unused")
- private ExposeMessage() {
-
- }
-
- public ExposeMessage(User user, IMAPFolder folder,IMAPMessage message) {
- this.user = user;
+ public ExposeMessage(String sessionId, IMAPFolder folder,IMAPMessage message) {
+ super(sessionId);
this.folder = folder;
this.message = message;
}
-
- public User getUser() {
- return user;
+
+ @SuppressWarnings("unused")
+ private ExposeMessage() {
}
public IMAPFolder getFolder() {
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java Wed Jul 29 10:40:29 2009
@@ -19,28 +19,21 @@
package org.apache.hupa.shared.rpc;
-import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.User;
-
-public class FetchFolders implements Action<FetchFoldersResult>{
+public class FetchFolders extends Session<FetchFoldersResult>{
/**
*
*/
private static final long serialVersionUID = 8515539585915762904L;
- private User user;
- public FetchFolders(User user) {
- this.user = user;
+ public FetchFolders(String sessionId) {
+ super(sessionId);
}
@SuppressWarnings("unused")
private FetchFolders() {
}
- public User getUser() {
- return user;
- }
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java Wed Jul 29 10:40:29 2009
@@ -19,38 +19,30 @@
package org.apache.hupa.shared.rpc;
-import net.customware.gwt.dispatch.shared.Action;
-
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
-public class FetchMessages implements Action<FetchMessagesResult>{
+public class FetchMessages extends Session<FetchMessagesResult>{
/**
*
*/
private static final long serialVersionUID = -3181183289937321202L;
- private User user;
private IMAPFolder folder;
private int start;
private int offset;
private String searchString;
- public FetchMessages(User user, IMAPFolder folder,int start, int offset,String searchString) {
- this.user= user;
- this.folder = folder;
- this.start = start;
- this.offset = offset;
- this.searchString = searchString;
- }
-
@SuppressWarnings("unused")
private FetchMessages() {
}
- public User getUser() {
- return user;
+ public FetchMessages(String sessionId, IMAPFolder folder,int start, int offset,String searchString) {
+ super(sessionId);
+ this.folder = folder;
+ this.start = start;
+ this.offset = offset;
+ this.searchString = searchString;
}
public IMAPFolder getFolder() {
Added: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginSession.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginSession.java?rev=798850&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginSession.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginSession.java Wed Jul 29 10:40:29 2009
@@ -0,0 +1,38 @@
+/****************************************************************
+ * 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.rpc;
+
+public class LoginSession extends Session<LoginUserResult>{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1713238752302781548L;
+
+ public LoginSession(String sessionId) {
+ super(sessionId);
+ }
+
+
+ @SuppressWarnings("unused")
+ private LoginSession() {
+
+ }
+}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java Wed Jul 29 10:40:29 2009
@@ -19,28 +19,21 @@
package org.apache.hupa.shared.rpc;
-import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.User;
-
-public class LogoutUser implements Action<LogoutUserResult>{
+public class LogoutUser extends Session<LogoutUserResult>{
/**
*
*/
private static final long serialVersionUID = 2255166545722718094L;
- private User user;
-
- @SuppressWarnings("unused")
- private LogoutUser() {
-
- }
- public LogoutUser(User user) {
- this.user = user;
+ public LogoutUser(String sessionId) {
+ super(sessionId);
}
- public User getUser() {
- return user;
+ @SuppressWarnings("unused")
+ private LogoutUser() {
+
}
+
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java Wed Jul 29 10:40:29 2009
@@ -19,27 +19,20 @@
package org.apache.hupa.shared.rpc;
-import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.User;
-
-public class Noop implements Action<NoopResult>{
+public class Noop extends Session<NoopResult>{
/**
*
*/
private static final long serialVersionUID = 4076791577558340559L;
- private User user;
+ public Noop(String sessionId) {
+ super(sessionId);
+ }
+
@SuppressWarnings("unused")
private Noop() {
}
- public Noop(User user) {
- this.user = user;
- }
-
- public User getUser() {
- return user;
- }
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java?rev=798850&r1=798849&r2=798850&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java Wed Jul 29 10:40:29 2009
@@ -1,36 +1,48 @@
-package org.apache.hupa.shared.rpc;
+/****************************************************************
+ * 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.rpc;
-import net.customware.gwt.dispatch.shared.Action;
import org.apache.hupa.shared.data.Message;
-import org.apache.hupa.shared.data.User;
-public class SendMessage implements Action<EmptyResult>{
+public class SendMessage extends Session<EmptyResult>{
/**
*
*/
private static final long serialVersionUID = 973668124208945015L;
private Message msg;
- private User user;
+
+ public SendMessage(String sessionId, Message msg) {
+ super(sessionId);
+ this.msg = msg;
+ }
+
@SuppressWarnings("unused")
private SendMessage() {
}
- public SendMessage(User user, Message msg) {
- this.msg = msg;
- this.user = user;
- }
-
public Message getMessage() {
return msg;
}
- public User getUser() {
- return user;
- }
-
}
Added: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Session.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Session.java?rev=798850&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Session.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Session.java Wed Jul 29 10:40:29 2009
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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.rpc;
+
+import net.customware.gwt.dispatch.shared.Action;
+import net.customware.gwt.dispatch.shared.Result;
+
+public abstract class Session<R extends Result> implements Action<R>{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4235459859099723779L;
+ private String sessionId;
+
+ protected Session() {
+
+ }
+
+ public Session(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org