You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:13:22 UTC
svn commit: r1522173 - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/activity/
client/src/main/java/org/apache/hupa/client/rf/
server/src/main/java/org/apache/hupa/server/ioc/
server/src/main/java/org/apache/hupa/server/service/ sha...
Author: dongxu
Date: Thu Sep 12 03:13:20 2013
New Revision: 1522173
URL: http://svn.apache.org/r1522173
Log:
other RFs
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagServiceImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MoveMessageActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SetFlagActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawAction.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleAction.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserAction.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MoveMessageAction.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SetFlagAction.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 03:13:20 2013
@@ -3,16 +3,22 @@ package org.apache.hupa.client.activity;
import java.util.ArrayList;
import java.util.List;
+<<<<<<< HEAD
import org.apache.hupa.client.CachingDispatchAsync;
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.client.evo.HupaEvoCallback;
+=======
+>>>>>>> other RFs
import org.apache.hupa.client.place.IMAPMessagePlace;
+import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
+import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.shared.SConsts;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import org.apache.hupa.client.HupaEvoCallback;
import org.apache.hupa.client.mvp.WidgetDisplayable;
@@ -33,6 +39,10 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.MessageDetails;
=======
>>>>>>> try to get message details, problem is:
+=======
+import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
+import org.apache.hupa.shared.domain.DeleteMessageResult;
+>>>>>>> other RFs
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageAttachment;
@@ -46,6 +56,7 @@ import org.apache.hupa.shared.events.Rep
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> 1. improve the inbox folder place.
@@ -59,6 +70,8 @@ import org.apache.hupa.shared.proxy.Imap
>>>>>>> Allow client can use the domain entity interface.
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
+=======
+>>>>>>> other RFs
import com.google.gwt.activity.shared.AbstractActivity;
import com.google.gwt.core.client.GWT;
@@ -70,24 +83,32 @@ import com.google.gwt.place.shared.Place
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
+import com.google.web.bindery.requestfactory.shared.Receiver;
-public class IMAPMessageActivity extends AbstractActivity {
+public class IMAPMessageActivity extends AbstractActivity {
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
- updateDisplay();
+ updateDisplay();
bind();
container.setWidget(display.asWidget());
}
-
- public IMAPMessageActivity with(IMAPMessagePlace place){
- this.message = place.getMessage();
- this.messageDetails = place.getMessageDetails();
- this.folder = place.getFolder();
- this.user = place.getUser();
- return this;
+
+ public IMAPMessageActivity with(IMAPMessagePlace place) {
+ this.message = place.getMessage();
+ this.messageDetails = place.getMessageDetails();
+ this.folder = place.getFolder();
+ this.user = place.getUser();
+ return this;
}
+ private void updateDisplay() {
+ display.setAttachments(messageDetails.getMessageAttachments(), folder.getFullName(), message.getUid());
+ display.setHeaders(message);
+ display.setContent(messageDetails.getText());
+ }
+
+<<<<<<< HEAD
private void updateDisplay() {
display.setAttachments(messageDetails.getMessageAttachments(), folder.getFullName(),message.getUid());
display.setHeaders(message);
@@ -184,5 +205,86 @@ public class IMAPMessageActivity extend
public HasClickHandlers getReplyAllButtonClick();
public HasClickHandlers getForwardButtonClick();
public HasClickHandlers getBackButtonClick();
+=======
+ protected void bind() {
+ display.getDeleteButtonClick().addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ ArrayList<Long> uidList = new ArrayList<Long>();
+ uidList.add(message.getUid());
+ DeleteMessageByUidRequest req = requestFactory.deleteMessageByUidRequest();
+ DeleteMessageByUidAction action = req.create(DeleteMessageByUidAction.class);
+ action.setMessageUids(uidList);
+ action.setFolder(folder);
+ req.delete(action).fire(new Receiver<DeleteMessageResult>() {
+ @Override
+ public void onSuccess(DeleteMessageResult response) {
+ eventBus.fireEvent(new LoadMessagesEvent(user, folder));
+ }
+ });
+ }
+
+ });
+ display.getForwardButtonClick().addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ eventBus.fireEvent(new ForwardMessageEvent(user, folder, message, messageDetails));
+ }
+
+ });
+ display.getReplyButtonClick().addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ eventBus.fireEvent(new ReplyMessageEvent(user, folder, message, messageDetails, false));
+ }
+
+ });
+ display.getReplyAllButtonClick().addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ eventBus.fireEvent(new ReplyMessageEvent(user, folder, message, messageDetails, true));
+ }
+
+ });
+ display.getBackButtonClick().addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ eventBus.fireEvent(new BackEvent());
+ }
+
+ });
+ display.getShowRawMessageClick().addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ String message_url = GWT.getModuleBaseURL() + SConsts.SERVLET_SOURCE + "?" + SConsts.PARAM_UID + "="
+ + message.getUid() + "&" + SConsts.PARAM_FOLDER + "=" + folder.getFullName();
+ Window.open(message_url, "_blank", "");
+ }
+
+ });
+
+ }
+
+ private MessageDetails messageDetails;
+ private Message message;
+ private ImapFolder folder;
+ private User user;
+ // @Inject private CachingDispatchAsync dispatcher;
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
+ @Inject private HupaRequestFactory requestFactory;
+
+ public interface Displayable extends WidgetDisplayable {
+ public void setHeaders(Message msg);
+ public void setAttachments(List<MessageAttachment> attachements, String folder, long uid);
+ public void setContent(String content);
+
+ public HasClickHandlers getShowRawMessageClick();
+ public HasClickHandlers getDeleteButtonClick();
+ public HasClickHandlers getReplyButtonClick();
+ public HasClickHandlers getReplyAllButtonClick();
+ public HasClickHandlers getForwardButtonClick();
+ public HasClickHandlers getBackButtonClick();
+>>>>>>> other RFs
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java Thu Sep 12 03:13:20 2013
@@ -398,6 +398,8 @@ import org.apache.hupa.client.place.Mess
import org.apache.hupa.client.rf.DeleteMessageAllRequest;
import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
+import org.apache.hupa.client.rf.MoveMessageRequest;
+import org.apache.hupa.client.rf.SetFlagRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.shared.data.MessageImpl;
@@ -405,13 +407,17 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.domain.DeleteMessageAllAction;
import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
import org.apache.hupa.shared.domain.DeleteMessageResult;
+import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
+import org.apache.hupa.shared.domain.MoveMessageAction;
+import org.apache.hupa.shared.domain.SetFlagAction;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.FolderSelectionEvent;
import org.apache.hupa.shared.events.FolderSelectionEventHandler;
+import org.apache.hupa.shared.events.IncreaseUnseenEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
@@ -643,18 +649,21 @@ public class IMAPMessageListActivity ext
});
eventBus.addHandler(MoveMessageEvent.TYPE, new MoveMessageEventHandler() {
-
public void onMoveMessageHandler(MoveMessageEvent event) {
final Message message = event.getMessage();
- // dispatcher.execute(new MoveMessage(event.getOldFolder(),
- // event.getNewFolder(), message.getUid()), new
- // HupaEvoCallback<MoveMessageResult>(dispatcher, eventBus) {
- // public void callback(MoveMessageResult result) {
- // ArrayList<Message> messageArray = new ArrayList<Message>();
- // messageArray.add(message);
- // display.removeMessages(messageArray);
- // }
- // });
+ MoveMessageRequest req = requestFactory.moveMessageRequest();
+ MoveMessageAction action = req.create(MoveMessageAction.class);
+ action.setMessageUid(message.getUid());
+ action.setNewFolder(event.getNewFolder());
+ action.setOldFolder(event.getOldFolder());
+ req.move(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void onSuccess(GenericResult response) {
+ List<Message> messageArray = new ArrayList<Message>();
+ messageArray.add(message);
+ display.removeMessages(messageArray);
+ }
+ });
}
});
@@ -735,20 +744,25 @@ public class IMAPMessageListActivity ext
selectedMessages.remove(m);
}
}
- // dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, true,
- // uids), new HupaEvoCallback<GenericResult>(dispatcher,
- // eventBus) {
- // public void callback(GenericResult result) {
- // for (Message m : selectedMessages) {
- // if (m.getFlags().contains(IMAPFlag.SEEN) == false) {
- // m.getFlags().add(IMAPFlag.SEEN);
- // }
- // }
- // display.redraw();
- // eventBus.fireEvent(new DecreaseUnseenEvent(user,
- // folder,selectedMessages.size()));
- // }
- // });
+
+ SetFlagRequest req = requestFactory.setFlagRequest();
+ SetFlagAction action = req.create(SetFlagAction.class);
+ action.setFlag(IMAPFlag.SEEN);
+ action.setFolder(folder);
+ action.setUids(uids);
+ action.setValue(true);
+ req.set(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void onSuccess(GenericResult response) {
+ for (Message m : selectedMessages) {
+ if (m.getFlags().contains(IMAPFlag.SEEN) == false) {
+ m.getFlags().add(IMAPFlag.SEEN);
+ }
+ }
+ display.redraw();
+ eventBus.fireEvent(new DecreaseUnseenEvent(user, folder, selectedMessages.size()));
+ }
+ });
}
});
@@ -764,21 +778,25 @@ public class IMAPMessageListActivity ext
selectedMessages.remove(m);
}
}
+ SetFlagRequest req = requestFactory.setFlagRequest();
+ SetFlagAction action = req.create(SetFlagAction.class);
+ action.setFlag(IMAPFlag.SEEN);
+ action.setFolder(folder);
+ action.setUids(uids);
+ action.setValue(false);
+ req.set(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void onSuccess(GenericResult response) {
+ for (Message m : selectedMessages) {
+ if (m.getFlags().contains(IMAPFlag.SEEN)) {
+ m.getFlags().remove(IMAPFlag.SEEN);
+ }
+ }
+ display.redraw();
+ eventBus.fireEvent(new IncreaseUnseenEvent(user, folder, selectedMessages.size()));
- // dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, false,
- // uids), new HupaEvoCallback<GenericResult>(dispatcher,
- // eventBus) {
- // public void callback(GenericResult result) {
- // for (Message m : selectedMessages) {
- // if (m.getFlags().contains(IMAPFlag.SEEN)) {
- // m.getFlags().remove(IMAPFlag.SEEN);
- // }
- // }
- // display.redraw();
- // eventBus.fireEvent(new IncreaseUnseenEvent(user,
- // folder,selectedMessages.size()));
- // }
- // });
+ }
+ });
}
});
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java Thu Sep 12 03:13:20 2013
@@ -55,7 +55,13 @@ import org.apache.hupa.shared.data.User;
>>>>>>> introduce the top activity
=======
import org.apache.hupa.client.place.DefaultPlace;
+import org.apache.hupa.client.rf.HupaRequestFactory;
+import org.apache.hupa.client.rf.IdleRequest;
+import org.apache.hupa.client.rf.LogoutUserRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
+import org.apache.hupa.shared.domain.IdleAction;
+import org.apache.hupa.shared.domain.IdleResult;
+import org.apache.hupa.shared.domain.LogoutUserResult;
import org.apache.hupa.shared.domain.User;
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.shared.events.FlashEvent;
@@ -115,17 +121,22 @@ import com.google.gwt.user.client.ui.Has
import com.google.inject.Inject;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.inject.Provider;
=======
>>>>>>> introduce the top activity
=======
import com.google.inject.Provider;
>>>>>>>
+=======
+import com.google.web.bindery.requestfactory.shared.Receiver;
+>>>>>>> other RFs
public class TopActivity extends AbstractActivity {
private static final int IDLE_INTERVAL = 150000;
<<<<<<< HEAD
+<<<<<<< HEAD
HupaConstants constants;
<<<<<<< HEAD
>>>>>>> introduce the top activity
@@ -133,6 +144,9 @@ public class TopActivity extends Abstrac
>>>>>>> introduce the top activity
=======
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
+=======
+
+>>>>>>> other RFs
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
@@ -140,6 +154,7 @@ public class TopActivity extends Abstrac
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
checkSession();
>>>>>>> introduce the top activity
@@ -149,6 +164,9 @@ public class TopActivity extends Abstrac
=======
// checkSession();
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+ // checkSession();
+>>>>>>> other RFs
}
private void bind() {
@@ -186,6 +204,7 @@ public class TopActivity extends Abstrac
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
TopActivity.this.placeController.goTo(defaultPlaceProvider.get());
}
<<<<<<< HEAD
@@ -214,6 +233,8 @@ public class TopActivity extends Abstrac
=======
// TopActivity.this.placeController.goTo(defaultPlaceProvider.get());
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+>>>>>>> other RFs
}
>>>>>>> introduce the top activity
@@ -283,27 +304,9 @@ public class TopActivity extends Abstrac
});
}
- private void checkSession() {
- System.out.println("+++++++++++++");
-// dispatcher.execute(new CheckSession(), new AsyncCallback<CheckSessionResult>() {
-// public void onFailure(Throwable caught) {
-// serverStatus = ServerStatus.Unavailable;
-// display.setServerStatus(serverStatus);
-// showLogin(null);
-// }
-// public void onSuccess(CheckSessionResult result) {
-// serverStatus = ServerStatus.Available;
-// display.setServerStatus(serverStatus);
-// if (result.isValid()) {
-// eventBus.fireEvent(new LoginEvent(result.getUser()));
-// } else {
-// showLogin(null);
-// }
-// }
-// });
- }
private void doLogout() {
<<<<<<< HEAD
+<<<<<<< HEAD
if (user != null) {
dispatcher.execute(new LogoutUser(), new HupaEvoCallback<LogoutUserResult>(dispatcher, eventBus) {
public void callback(LogoutUserResult result) {
@@ -324,6 +327,17 @@ public class TopActivity extends Abstrac
// });
// }
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+ if (user != null) {
+ LogoutUserRequest req = requestFactory.logoutRequest();
+ req.logout().fire(new Receiver<LogoutUserResult>() {
+ @Override
+ public void onSuccess(LogoutUserResult response) {
+ eventBus.fireEvent(new LogoutEvent(response.getUser()));
+ }
+ });
+ }
+>>>>>>> other RFs
}
private void showMain(User user) {
@@ -335,11 +349,15 @@ public class TopActivity extends Abstrac
display.showTopNavigation(false);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
// placeController.goTo(new DefaultPlace());
=======
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+ placeController.goTo(new DefaultPlace());
+>>>>>>> other RFs
}
private void showContacts() {
@@ -348,6 +366,9 @@ public class TopActivity extends Abstrac
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
private Timer noopTimer = new IdleTimer();
@@ -442,32 +463,45 @@ public class TopActivity extends Abstrac
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
-// @Inject private DispatchAsync dispatcher;
-// @Inject private Provider<DefaultPlace> defaultPlaceProvider;
@Inject private HupaConstants constants;
+<<<<<<< HEAD
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
+=======
+ @Inject private HupaRequestFactory requestFactory;
+>>>>>>> other RFs
private User user;
private ServerStatus serverStatus = ServerStatus.Available;
private class IdleTimer extends Timer {
boolean running = false;
+
public void run() {
if (!running) {
running = true;
<<<<<<< HEAD
+<<<<<<< HEAD
dispatcher.execute(new Idle(), new HupaEvoCallback<IdleResult>(dispatcher, eventBus) {
public void callback(IdleResult result) {
<<<<<<< HEAD
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+ IdleRequest req = requestFactory.idleRequest();
+ IdleAction action = req.create(IdleAction.class);
+ req.idle(action).fire(new Receiver<IdleResult>() {
+
+ @Override
+ public void onSuccess(IdleResult response) {
+>>>>>>> other RFs
running = false;
// check if the server is not supporting the Idle
// command.
// if so cancel this Timer
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
if (response.isSupported() == false) {
=======
if (result.isSupported() == false) {
@@ -475,6 +509,9 @@ public class TopActivity extends Abstrac
=======
if (result.isSupported() == false) {
>>>>>>> introduce the top activity
+=======
+ if (response.isSupported() == false) {
+>>>>>>> other RFs
IdleTimer.this.cancel();
}
// Noop
@@ -482,6 +519,7 @@ public class TopActivity extends Abstrac
// (new messages ...)
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> introduce the top activity
@@ -505,6 +543,11 @@ public class TopActivity extends Abstrac
// }
// });
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+
+ }
+ });
+>>>>>>> other RFs
}
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 03:13:20 2013
@@ -936,25 +936,6 @@ System.out.println("1111111"+response);
response.getMessageDetails()));
}
});
- // dispatcher.execute(new
- // GetMessageDetails(event.getFolder(),
- // message.getUid()), new
- // HupaEvoCallback<GetMessageDetailsResult>(dispatcher,
- // eventBus, display) {
- // public void callback(GetMessageDetailsResult result)
- // {
- // if (decreaseUnseen) {
- // eventBus.fireEvent(new DecreaseUnseenEvent(user,
- // folder));
- // }
- // display.setLoadingMessage(false);
- // // showMessage(user, folder, message,
- // result.getMessageDetails());
- //
- // placeController.goTo(messagePlaceProvider.get().with(user,folder,
- // message,result.getMessageDetails()));
- // }
- // });
}
>>>>>>> try to change fetch messages to use RF
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java Thu Sep 12 03:13:20 2013
@@ -87,12 +87,18 @@ public interface HupaRequestFactory exte
CheckSessionRequest sessionRequest();
LoginUserRequest loginRequest();
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
=======
FetchMessagesRequest messagesRequest();
<<<<<<< HEAD
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
=======
+=======
+ LogoutUserRequest logoutRequest();
+ FetchMessagesRequest messagesRequest();
+ MoveMessageRequest moveMessageRequest();
+>>>>>>> other RFs
CreateFolderRequest createFolderRequest();
<<<<<<< HEAD
>>>>>>> Succeed creating new folder
@@ -114,5 +120,10 @@ public interface HupaRequestFactory exte
SendMessageRequest sendMessageRequest();
SendForwardMessageRequest sendForwardMessageRequest();
SendReplyMessageRequest sendReplyMessageRequest();
+<<<<<<< HEAD
>>>>>>> forward and reply message to use RF
+=======
+ IdleRequest idleRequest();
+ SetFlagRequest setFlagRequest();
+>>>>>>> other RFs
}
\ No newline at end of file
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java Thu Sep 12 03:13:20 2013
@@ -63,10 +63,14 @@ import org.apache.hupa.server.service.Fe
import org.apache.hupa.server.service.GetMessageDetailsService;
import org.apache.hupa.server.service.GetMessageDetailsServiceImpl;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
import org.apache.hupa.server.service.GetMessageRawService;
import org.apache.hupa.server.service.GetMessageRawServiceImpl;
import org.apache.hupa.server.service.IdleService;
import org.apache.hupa.server.service.IdleServiceImpl;
+<<<<<<< HEAD
=======
import org.apache.hupa.server.guice.providers.HttpSessionProvider;
=======
@@ -95,6 +99,8 @@ import org.apache.hupa.server.service.Fe
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
=======
>>>>>>> try to get message details, problem is:
+=======
+>>>>>>> other RFs
import org.apache.hupa.server.service.ImapFolderService;
import org.apache.hupa.server.service.ImapFolderServiceImpl;
import org.apache.hupa.server.service.LoginUserService;
@@ -103,10 +109,14 @@ import org.apache.hupa.server.service.Lo
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
import org.apache.hupa.server.service.LogoutUserService;
import org.apache.hupa.server.service.LogoutUserServiceImpl;
import org.apache.hupa.server.service.MoveMessageService;
import org.apache.hupa.server.service.MoveMessageServiceImpl;
+<<<<<<< HEAD
import org.apache.hupa.server.service.RenameFolderService;
import org.apache.hupa.server.service.RenameFolderServiceImpl;
import org.apache.hupa.server.service.SendForwardMessageService;
@@ -125,6 +135,8 @@ import org.apache.hupa.shared.data.Delet
import org.apache.hupa.shared.data.DeleteMessageAllActionImpl;
import org.apache.hupa.shared.data.DeleteMessageByUidActionImpl;
=======
+=======
+>>>>>>> other RFs
import org.apache.hupa.server.service.RenameFolderService;
import org.apache.hupa.server.service.RenameFolderServiceImpl;
import org.apache.hupa.server.service.SendForwardMessageService;
@@ -133,6 +145,8 @@ import org.apache.hupa.server.service.Se
import org.apache.hupa.server.service.SendMessageService;
import org.apache.hupa.server.service.SendReplyMessageService;
import org.apache.hupa.server.service.SendReplyMessageServiceImpl;
+import org.apache.hupa.server.service.SetFlagService;
+import org.apache.hupa.server.service.SetFlagServiceImpl;
import org.apache.hupa.shared.data.CreateFolderActionImpl;
import org.apache.hupa.shared.data.DeleteFolderActionImpl;
<<<<<<< HEAD
@@ -147,12 +161,18 @@ import org.apache.hupa.shared.data.Gener
import org.apache.hupa.shared.data.GetMessageDetailsActionImpl;
import org.apache.hupa.shared.data.GetMessageDetailsResultImpl;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
import org.apache.hupa.shared.data.GetMessageRawActionImpl;
import org.apache.hupa.shared.data.GetMessageRawResultImpl;
import org.apache.hupa.shared.data.IdleActionImpl;
import org.apache.hupa.shared.data.IdleResultImpl;
import org.apache.hupa.shared.data.ImapFolderImpl;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
import org.apache.hupa.shared.data.LogoutUserActionImpl;
import org.apache.hupa.shared.data.MailHeaderImpl;
import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -163,6 +183,7 @@ import org.apache.hupa.shared.data.SendF
import org.apache.hupa.shared.data.SendMessageActionImpl;
import org.apache.hupa.shared.data.SendReplyMessageActionImpl;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SetFlagActionImpl;
import org.apache.hupa.shared.data.SmtpMessageImpl;
=======
@@ -175,6 +196,9 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.RenameFolderActionImpl;
>>>>>>> delete and rename folder
=======
+=======
+import org.apache.hupa.shared.data.SetFlagActionImpl;
+>>>>>>> other RFs
import org.apache.hupa.shared.data.SmtpMessageImpl;
>>>>>>> forward and reply message to use RF
import org.apache.hupa.shared.data.TagImpl;
@@ -197,10 +221,14 @@ import org.apache.hupa.shared.domain.Gen
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
import org.apache.hupa.shared.domain.GetMessageDetailsResult;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
import org.apache.hupa.shared.domain.GetMessageRawAction;
import org.apache.hupa.shared.domain.GetMessageRawResult;
import org.apache.hupa.shared.domain.IdleAction;
import org.apache.hupa.shared.domain.IdleResult;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
<<<<<<< HEAD
import org.apache.hupa.shared.domain.LogoutUserAction;
@@ -209,10 +237,14 @@ import org.apache.hupa.shared.domain.Mes
import org.apache.hupa.shared.domain.MessageDetails;
import org.apache.hupa.shared.domain.MoveMessageAction;
=======
+=======
+>>>>>>> other RFs
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.LogoutUserAction;
import org.apache.hupa.shared.domain.MailHeader;
import org.apache.hupa.shared.domain.MessageAttachment;
import org.apache.hupa.shared.domain.MessageDetails;
+<<<<<<< HEAD
>>>>>>> try to get message details, problem is:
import org.apache.hupa.shared.domain.RenameFolderAction;
import org.apache.hupa.shared.domain.SendForwardMessageAction;
@@ -220,6 +252,9 @@ import org.apache.hupa.shared.domain.Sen
import org.apache.hupa.shared.domain.SendReplyMessageAction;
import org.apache.hupa.shared.domain.SetFlagAction;
=======
+=======
+import org.apache.hupa.shared.domain.MoveMessageAction;
+>>>>>>> other RFs
import org.apache.hupa.shared.domain.RenameFolderAction;
<<<<<<< HEAD
>>>>>>> delete and rename folder
@@ -249,6 +284,7 @@ import org.apache.hupa.shared.domain.Ima
import org.apache.hupa.shared.domain.SendForwardMessageAction;
import org.apache.hupa.shared.domain.SendMessageAction;
import org.apache.hupa.shared.domain.SendReplyMessageAction;
+import org.apache.hupa.shared.domain.SetFlagAction;
import org.apache.hupa.shared.domain.SmtpMessage;
>>>>>>> forward and reply message to use RF
import org.apache.hupa.shared.domain.Settings;
@@ -321,6 +357,9 @@ public class GuiceServerModule extends A
bind(SendForwardMessageAction.class).to(SendForwardMessageActionImpl.class);
bind(SendReplyMessageAction.class).to(SendReplyMessageActionImpl.class);
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> other RFs
bind(GetMessageRawAction.class).to(GetMessageRawActionImpl.class);
bind(GetMessageRawResult.class).to(GetMessageRawResultImpl.class);
bind(IdleAction.class).to(IdleActionImpl.class);
@@ -328,6 +367,7 @@ public class GuiceServerModule extends A
bind(LogoutUserAction.class).to(LogoutUserActionImpl.class);
bind(MoveMessageAction.class).to(MoveMessageActionImpl.class);
bind(SetFlagAction.class).to(SetFlagActionImpl.class);
+<<<<<<< HEAD
=======
>>>>>>> forward and reply message to use RF
@@ -368,6 +408,9 @@ public class GuiceServerModule extends A
=======
bind(GetMessageDetailsAction.class).to(GetMessageDetailsActionImpl.class);
bind(GetMessageDetailsResult.class).to(GetMessageDetailsResultImpl.class);
+=======
+
+>>>>>>> other RFs
>>>>>>> try to get message details, problem is:
@@ -429,7 +472,15 @@ public class GuiceServerModule extends A
bind(SendMessageService.class).to(SendMessageBaseServiceImpl.class);
bind(SendForwardMessageService.class).to(SendForwardMessageServiceImpl.class);
bind(SendReplyMessageService.class).to(SendReplyMessageServiceImpl.class);
+<<<<<<< HEAD
>>>>>>> forward and reply message to use RF
+=======
+ bind(GetMessageRawService.class).to(GetMessageRawServiceImpl.class);
+ bind(IdleService.class).to(IdleServiceImpl.class);
+ bind(LogoutUserService.class).to(LogoutUserServiceImpl.class);
+ bind(MoveMessageService.class).to(MoveMessageServiceImpl.class);
+ bind(SetFlagService.class).to(SetFlagServiceImpl.class);
+>>>>>>> other RFs
bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawService.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawService.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.GetMessageRawAction;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawServiceImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageRawServiceImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import java.io.ByteArrayOutputStream;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -28,5 +29,15 @@ import org.apache.hupa.shared.exception.
public interface IdleService {
IdleResult idle(IdleAction action) throws HupaException, MessagingException;
+=======
+package org.apache.hupa.server.service;
+
+import org.apache.hupa.shared.domain.IdleAction;
+import org.apache.hupa.shared.domain.IdleResult;
+
+public interface IdleService {
+
+ IdleResult idle(IdleAction action) throws Exception;
+>>>>>>> other RFs
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -25,12 +26,23 @@ import org.apache.hupa.shared.data.IdleR
import org.apache.hupa.shared.domain.IdleAction;
import org.apache.hupa.shared.domain.IdleResult;
import org.apache.hupa.shared.exception.HupaException;
+=======
+package org.apache.hupa.server.service;
+
+import org.apache.hupa.shared.data.IdleResultImpl;
+import org.apache.hupa.shared.domain.IdleAction;
+import org.apache.hupa.shared.domain.IdleResult;
+>>>>>>> other RFs
import com.sun.mail.imap.IMAPStore;
public class IdleServiceImpl extends AbstractService implements IdleService {
@Override
+<<<<<<< HEAD
public IdleResult idle(IdleAction action) throws HupaException, MessagingException {
+=======
+ public IdleResult idle(IdleAction action) throws Exception {
+>>>>>>> other RFs
try {
IMAPStore store = cache.get(getUser());
@@ -44,8 +56,13 @@ public class IdleServiceImpl extends Abs
}
}
return new IdleResultImpl(true);
+<<<<<<< HEAD
} catch (HupaException e) {
throw new HupaException("Unable to send NOOP " + e.getMessage());
+=======
+ } catch (Exception e) {
+ throw new Exception("Unable to send NOOP " + e.getMessage());
+>>>>>>> other RFs
}
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -24,4 +25,12 @@ import org.apache.hupa.shared.exception.
public interface LogoutUserService {
LogoutUserResult logout() throws HupaException;
+=======
+package org.apache.hupa.server.service;
+
+import org.apache.hupa.shared.domain.LogoutUserResult;
+
+public interface LogoutUserService {
+ LogoutUserResult logout();
+>>>>>>> other RFs
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,17 +18,26 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.shared.data.LogoutUserResultImpl;
import org.apache.hupa.shared.domain.LogoutUserResult;
import org.apache.hupa.shared.domain.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
public class LogoutUserServiceImpl extends AbstractService implements LogoutUserService {
@Override
public LogoutUserResult logout() throws HupaException {
+=======
+
+public class LogoutUserServiceImpl extends AbstractService implements LogoutUserService {
+ @Override
+ public LogoutUserResult logout() {
+>>>>>>> other RFs
User user = getUser();
user.setAuthenticated(false);
@@ -36,7 +46,11 @@ public class LogoutUserServiceImpl exten
cache.delete(user);
// remove user attributes from session
+<<<<<<< HEAD
SessionUtils.cleanSessionAttributes(httpSessionProvider.get());
+=======
+ SessionUtils.cleanSessionAttributes(httpSession);
+>>>>>>> other RFs
return new LogoutUserResultImpl(user);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageService.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageService.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.GenericResult;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageServiceImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/MoveMessageServiceImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import javax.mail.Flags;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagService.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagService.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.GenericResult;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagServiceImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SetFlagServiceImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.server.service;
import java.util.List;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,10 +18,16 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.GetMessageRawAction;
import org.apache.hupa.shared.domain.ImapFolder;
+<<<<<<< HEAD
+=======
+import org.apache.hupa.shared.rpc.RawMessage;
+>>>>>>> other RFs
public class GetMessageRawActionImpl implements GetMessageRawAction {
@@ -44,8 +51,13 @@ public class GetMessageRawActionImpl imp
}
public boolean equals(Object obj) {
+<<<<<<< HEAD
if (obj instanceof GetMessageRawAction) {
GetMessageRawAction action = (GetMessageRawAction) obj;
+=======
+ if (obj instanceof RawMessage) {
+ RawMessage action = (RawMessage) obj;
+>>>>>>> other RFs
if (action.getFolder().equals(getFolder()) && action.getUid() == getUid()) {
return true;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.GetMessageRawResult;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.IdleAction;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.IdleResult;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.LogoutUserAction;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.LogoutUserResult;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MoveMessageActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MoveMessageActionImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MoveMessageActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MoveMessageActionImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.ImapFolder;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SetFlagActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SetFlagActionImpl.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SetFlagActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SetFlagActionImpl.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.data;
import java.util.List;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawAction.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawAction.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawResult.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageRawResult.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleAction.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleAction.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleResult.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/IdleResult.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserAction.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserAction.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MoveMessageAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MoveMessageAction.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MoveMessageAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MoveMessageAction.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SetFlagAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SetFlagAction.java?rev=1522173&r1=1522172&r2=1522173&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SetFlagAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SetFlagAction.java Thu Sep 12 03:13:20 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> other RFs
package org.apache.hupa.shared.domain;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org