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:06:04 UTC
svn commit: r1522166 - 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:06:03 2013
New Revision: 1522166
URL: http://svn.apache.org/r1522166
Log:
delete and rename folder
Modified:
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/DeleteFolderRequest.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/RenameFolderRequest.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/CreateFolderServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderServiceImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteFolderActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/RenameFolderActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteFolderAction.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/RenameFolderAction.java
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=1522166&r1=1522165&r2=1522166&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:06:03 2013
@@ -263,8 +263,10 @@ import org.apache.hupa.client.place.IMAP
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.CreateFolderRequest;
+import org.apache.hupa.client.rf.DeleteFolderRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.ImapFolderRequest;
+import org.apache.hupa.client.rf.RenameFolderRequest;
import org.apache.hupa.client.ui.WidgetContainerDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
@@ -272,9 +274,11 @@ import org.apache.hupa.shared.data.ImapF
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
import org.apache.hupa.shared.domain.CreateFolderAction;
+import org.apache.hupa.shared.domain.DeleteFolderAction;
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.RenameFolderAction;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.BackEventHandler;
@@ -774,17 +778,21 @@ System.out.println("1111111"+response);
ImapFolderImpl iFolder = new ImapFolderImpl((String) event.getOldValue());
final String newName = (String) event.getNewValue();
if (iFolder.getFullName().equalsIgnoreCase(newName) == false) {
- // dispatcher.execute(new RenameFolder(iFolder,
- // newName), new HupaEvoCallback<GenericResult>(
- // dispatcher, eventBus) {
- // public void callback(GenericResult result) {
- // folder.setFullName(newName);
- // }
- //
- // public void callbackError(Throwable caught) {
- // record.cancelEdit();
- // }
- // });
+ RenameFolderRequest req = requestFactory.renameFolderRequest();
+ RenameFolderAction action = req.create(RenameFolderAction.class);
+ action.setNewName(newName);
+ action.setFolder(iFolder);
+ req.rename(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void onSuccess(GenericResult response) {
+ folder.setFullName(newName);
+ }
+ @Override
+ public void onFailure(ServerFailure error) {
+ record.cancelEdit();
+ GWT.log("Error while renaming" + error.getStackTraceString());
+ }
+ });
}
}
}
@@ -1086,18 +1094,19 @@ System.out.println("1111111"+response);
display.getDeleteConfirmClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- // dispatcher.execute(new DeleteFolder(folder), new
- // AsyncCallback<GenericResult>() {
- //
- // public void onFailure(Throwable caught) {
- // GWT.log("ERROR while deleting", caught);
- // }
- //
- // public void onSuccess(GenericResult result) {
- // display.deleteSelectedFolder();
- // }
- //
- // });
+ DeleteFolderRequest req = requestFactory.deleteFolderRequest();
+ final DeleteFolderAction action = req.create(DeleteFolderAction.class);
+ action.setFolder(folder);
+ req.delete(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void onSuccess(GenericResult response) {
+ display.deleteSelectedFolder();
+ }
+ @Override
+ public void onFailure(ServerFailure error) {
+ GWT.log("Error while deleting" + error.getStackTraceString());
+ }
+ });
}
});
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
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=1522166&r1=1522165&r2=1522166&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:06:03 2013
@@ -94,5 +94,10 @@ public interface HupaRequestFactory exte
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
=======
CreateFolderRequest createFolderRequest();
+<<<<<<< HEAD
>>>>>>> Succeed creating new folder
+=======
+ DeleteFolderRequest deleteFolderRequest();
+ RenameFolderRequest renameFolderRequest();
+>>>>>>> delete and rename folder
}
\ No newline at end of file
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
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=1522166&r1=1522165&r2=1522166&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:06:03 2013
@@ -80,7 +80,12 @@ import org.apache.hupa.server.service.Ch
=======
import org.apache.hupa.server.service.CreateFolderService;
import org.apache.hupa.server.service.CreateFolderServiceImpl;
+<<<<<<< HEAD
>>>>>>> Succeed creating new folder
+=======
+import org.apache.hupa.server.service.DeleteFolderService;
+import org.apache.hupa.server.service.DeleteFolderServiceImpl;
+>>>>>>> delete and rename folder
import org.apache.hupa.server.service.FetchMessagesService;
import org.apache.hupa.server.service.FetchMessagesServiceImpl;
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
@@ -91,6 +96,7 @@ import org.apache.hupa.server.service.Lo
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.service.LogoutUserService;
import org.apache.hupa.server.service.LogoutUserServiceImpl;
import org.apache.hupa.server.service.MoveMessageService;
@@ -112,6 +118,12 @@ import org.apache.hupa.shared.data.Creat
import org.apache.hupa.shared.data.DeleteFolderActionImpl;
import org.apache.hupa.shared.data.DeleteMessageAllActionImpl;
import org.apache.hupa.shared.data.DeleteMessageByUidActionImpl;
+=======
+import org.apache.hupa.server.service.RenameFolderService;
+import org.apache.hupa.server.service.RenameFolderServiceImpl;
+import org.apache.hupa.shared.data.CreateFolderActionImpl;
+import org.apache.hupa.shared.data.DeleteFolderActionImpl;
+>>>>>>> delete and rename folder
import org.apache.hupa.shared.data.FetchMessagesActionImpl;
import org.apache.hupa.shared.data.FetchMessagesResultImpl;
import org.apache.hupa.shared.data.GenericResultImpl;
@@ -122,6 +134,7 @@ import org.apache.hupa.shared.data.GetMe
import org.apache.hupa.shared.data.IdleActionImpl;
import org.apache.hupa.shared.data.IdleResultImpl;
import org.apache.hupa.shared.data.ImapFolderImpl;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.LogoutUserActionImpl;
import org.apache.hupa.shared.data.MailHeaderImpl;
import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -133,12 +146,18 @@ import org.apache.hupa.shared.data.SendM
import org.apache.hupa.shared.data.SendReplyMessageActionImpl;
import org.apache.hupa.shared.data.SetFlagActionImpl;
import org.apache.hupa.shared.data.SmtpMessageImpl;
+=======
+import org.apache.hupa.shared.data.RenameFolderActionImpl;
+>>>>>>> delete and rename folder
import org.apache.hupa.shared.data.TagImpl;
import org.apache.hupa.shared.data.UserImpl;
import org.apache.hupa.shared.domain.CreateFolderAction;
import org.apache.hupa.shared.domain.DeleteFolderAction;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.DeleteMessageAllAction;
import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
+=======
+>>>>>>> delete and rename folder
import org.apache.hupa.shared.domain.FetchMessagesAction;
import org.apache.hupa.shared.domain.FetchMessagesResult;
import org.apache.hupa.shared.domain.GenericResult;
@@ -149,6 +168,7 @@ import org.apache.hupa.shared.domain.Get
import org.apache.hupa.shared.domain.IdleAction;
import org.apache.hupa.shared.domain.IdleResult;
import org.apache.hupa.shared.domain.ImapFolder;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.LogoutUserAction;
import org.apache.hupa.shared.domain.MailHeader;
import org.apache.hupa.shared.domain.MessageAttachment;
@@ -159,6 +179,9 @@ import org.apache.hupa.shared.domain.Sen
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.RenameFolderAction;
+>>>>>>> delete and rename folder
import org.apache.hupa.shared.domain.Settings;
import org.apache.hupa.shared.domain.SmtpMessage;
import org.apache.hupa.shared.domain.Tag;
@@ -269,7 +292,12 @@ public class GuiceServerModule extends A
=======
bind(GenericResult.class).to(GenericResultImpl.class);
bind(CreateFolderAction.class).to(CreateFolderActionImpl.class);
+<<<<<<< HEAD
>>>>>>> Succeed creating new folder
+=======
+ bind(DeleteFolderAction.class).to(DeleteFolderActionImpl.class);
+ bind(RenameFolderAction.class).to(RenameFolderActionImpl.class);
+>>>>>>> delete and rename folder
bind(CheckSessionService.class).to(CheckSessionServiceImpl.class);
bind(LoginUserService.class).to(LoginUserServiceImpl.class);
@@ -309,7 +337,12 @@ public class GuiceServerModule extends A
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
=======
bind(CreateFolderService.class).to(CreateFolderServiceImpl.class);
+<<<<<<< HEAD
>>>>>>> Succeed creating new folder
+=======
+ bind(DeleteFolderService.class).to(DeleteFolderServiceImpl.class);
+ bind(RenameFolderService.class).to(RenameFolderServiceImpl.class);
+>>>>>>> delete and rename folder
bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java Thu Sep 12 03:06:03 2013
@@ -39,6 +39,9 @@ public class CreateFolderServiceImpl ext
User user = getUser();
ImapFolder folder = action.getFolder();
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> delete and rename folder
IMAPStore store = cache.get(user);
Folder f = store.getFolder(folder.getFullName());
if (f.create(Folder.HOLDS_MESSAGES)) {
@@ -47,6 +50,7 @@ public class CreateFolderServiceImpl ext
} else {
logger.info("Unable to create folder " + folder + " for user " + user);
throw new Exception("Unable to create folder " + folder + " for user " + user);
+<<<<<<< HEAD
=======
@@ -65,6 +69,9 @@ public class CreateFolderServiceImpl ext
logger.error("Error while creating folder " + folder + " for user " + user, e);
throw new Exception("Error while creating folder " + folder + " for user " + user, e);
>>>>>>> Succeed creating new folder
+=======
+
+>>>>>>> delete and rename folder
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java Thu Sep 12 03:06:03 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -27,4 +28,13 @@ import org.apache.hupa.shared.exception.
public interface DeleteFolderService {
GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException;
+=======
+package org.apache.hupa.server.service;
+
+import org.apache.hupa.shared.domain.DeleteFolderAction;
+import org.apache.hupa.shared.domain.GenericResult;
+
+public interface DeleteFolderService {
+ GenericResult delete(DeleteFolderAction action) throws Exception;
+>>>>>>> delete and rename folder
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java Thu Sep 12 03:06:03 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -21,20 +22,32 @@ package org.apache.hupa.server.service;
import javax.mail.Folder;
import javax.mail.MessagingException;
+=======
+package org.apache.hupa.server.service;
+
+import javax.mail.Folder;
+>>>>>>> delete and rename folder
import org.apache.hupa.shared.data.GenericResultImpl;
import org.apache.hupa.shared.domain.DeleteFolderAction;
import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
+=======
+>>>>>>> delete and rename folder
import com.sun.mail.imap.IMAPStore;
public class DeleteFolderServiceImpl extends AbstractService implements DeleteFolderService {
@Override
+<<<<<<< HEAD
public GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException {
+=======
+ public GenericResult delete(DeleteFolderAction action) throws Exception {
+>>>>>>> delete and rename folder
User user = getUser();
ImapFolder folder = action.getFolder();
IMAPStore store = cache.get(user);
@@ -51,7 +64,11 @@ public class DeleteFolderServiceImpl ext
logger.info("Successfully delete folder " + folder + " for user " + user);
return new GenericResultImpl();
} else {
+<<<<<<< HEAD
throw new HupaException("Unable to delete folder " + folder + " for user " + user);
+=======
+ throw new Exception("Unable to delete folder " + folder + " for user " + user);
+>>>>>>> delete and rename folder
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderService.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderService.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
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/RenameFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderServiceImpl.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/RenameFolderServiceImpl.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
package org.apache.hupa.server.service;
import javax.mail.Folder;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteFolderActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteFolderActionImpl.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteFolderActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteFolderActionImpl.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.DeleteFolderAction;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/RenameFolderActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/RenameFolderActionImpl.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/RenameFolderActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/RenameFolderActionImpl.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
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/domain/DeleteFolderAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteFolderAction.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteFolderAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteFolderAction.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
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/RenameFolderAction.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/RenameFolderAction.java?rev=1522166&r1=1522165&r2=1522166&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/RenameFolderAction.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/RenameFolderAction.java Thu Sep 12 03:06:03 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. *
****************************************************************/
+=======
+>>>>>>> delete and rename folder
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org