james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r1525515 [10/13] - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ioc/ cl...
Date Mon, 23 Sep 2013 07:04:13 GMT
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,30 +17,12 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.domain.DeleteMessageAction;
 import org.apache.hupa.shared.domain.DeleteMessageResult;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
 
 public interface DeleteMessageByUidService {
 	public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException;
-=======
-
-public interface DeleteMessageByUidService {
-	public DeleteMessageResult delete(DeleteMessageAction action) throws Exception;
->>>>>>> delete messages, make WestActivity Singleton
-=======
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface DeleteMessageByUidService {
-	public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException;
->>>>>>> re-add server unit tests
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.util.ArrayList;
@@ -38,29 +29,14 @@ import org.apache.hupa.shared.domain.Del
 import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPStore;
 
 public class DeleteMessageByUidServiceImpl extends DeleteMessageBaseServiceImpl implements DeleteMessageByUidService{
 
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-    protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
-=======
-    protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception {
->>>>>>> delete messages, make WestActivity Singleton
-=======
     protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
->>>>>>> re-add server unit tests
 		DeleteMessageByUidAction action = (DeleteMessageByUidAction)actionBase;
     	ImapFolder folder = action.getFolder();
         List<Long> uids = action.getMessageUids();
@@ -87,15 +63,7 @@ public class DeleteMessageByUidServiceIm
             logger.error("Error while deleting messages with uids "
                     + action.getMessageUids() + " for user " + user
                     + " in folder" + action.getFolder(), e);
-<<<<<<< HEAD
-<<<<<<< HEAD
-            throw new HupaException("Error while deleting messages", e);
-=======
-            throw new Exception("Error while deleting messages", e);
->>>>>>> delete messages, make WestActivity Singleton
-=======
             throw new HupaException("Error while deleting messages", e);
->>>>>>> re-add server unit tests
         }
 
     }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java Mon Sep 23 07:04:08 2013
@@ -24,25 +24,8 @@ import java.util.List;
 import javax.mail.MessagingException;
 
 import org.apache.hupa.shared.domain.ImapFolder;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
 
 public interface FetchFoldersService {
 	List<ImapFolder> fetch(ImapFolder folder, Boolean recursive) throws MessagingException, HupaException;
-=======
-
-public interface FetchFoldersService {
-	List<ImapFolder> fetch(ImapFolder folder) throws MessagingException;
->>>>>>> Fix issue #15.
-=======
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface FetchFoldersService {
-<<<<<<< HEAD
-	List<ImapFolder> fetch(ImapFolder folder) throws MessagingException, HupaException;
->>>>>>> re-add server unit tests
-=======
-	List<ImapFolder> fetch(ImapFolder folder, Boolean recursive) throws MessagingException, HupaException;
->>>>>>> pull all folders for label settings
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -27,42 +27,18 @@ import javax.mail.MessagingException;
 
 import org.apache.hupa.shared.data.ImapFolderImpl;
 import org.apache.hupa.shared.domain.ImapFolder;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> pull all folders for label settings
 import org.apache.hupa.shared.domain.User;
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> Fix issue #15.
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPStore;
 
 public class FetchFoldersServiceImpl extends AbstractService implements FetchFoldersService {
 
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> pull all folders for label settings
 	public List<ImapFolder> fetch(ImapFolder imapFolder, Boolean recursive) throws MessagingException, HupaException {
 		if(recursive){
 			return this.pullAll();
 		}
-<<<<<<< HEAD
-=======
-	public List<ImapFolder> fetch(ImapFolder imapFolder) throws MessagingException {
->>>>>>> Fix issue #15.
-=======
-	public List<ImapFolder> fetch(ImapFolder imapFolder) throws MessagingException, HupaException{
->>>>>>> re-add server unit tests
-=======
->>>>>>> pull all folders for label settings
 		try {
 			Folder folder = null;
 			IMAPStore store = cache.get(getUser());
@@ -82,10 +58,6 @@ public class FetchFoldersServiceImpl ext
 			throw new MessagingException();
 		}
 	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> pull all folders for label settings
 	
 	public List<ImapFolder> pullAll() throws MessagingException, HupaException {
 		User user = getUser();
@@ -159,17 +131,10 @@ public class FetchFoldersServiceImpl ext
 
 		return iFolder;
 	}
-<<<<<<< HEAD
-=======
->>>>>>> Fix issue #15.
-=======
->>>>>>> pull all folders for label settings
 
 	/**
 	 * Create a new IMAPFolder from the given Folder
 	 * 
-<<<<<<< HEAD
-<<<<<<< HEAD
 	 * @param folder
 	 *            Current folder
 	 * @return imapFolder Created IMAPFolder
@@ -180,38 +145,11 @@ public class FetchFoldersServiceImpl ext
 	 *             If an error occurs
 	 */
 	private ImapFolder createImapFolder(Folder folder) throws HupaException {
-=======
-	 * @param folder Current folder
-=======
-	 * @param folder
-	 *            Current folder
->>>>>>> pull all folders for label settings
-	 * @return imapFolder Created IMAPFolder
-	 * @throws HupaException
-	 * @throws Exception
-	 *             If an error occurs
-	 * @throws MessagingException
-	 *             If an error occurs
-	 */
-<<<<<<< HEAD
-	private ImapFolder createImapFolder(Folder folder) {
->>>>>>> Fix issue #15.
-=======
-	private ImapFolder createImapFolder(Folder folder) throws HupaException {
->>>>>>> bind FolderListActivity to Singleton, otherwise it might create its view several times
 		String fullName = folder.getFullName();
 		String delimiter;
 		ImapFolder iFolder = null;
 		try {
-<<<<<<< HEAD
-<<<<<<< HEAD
-			System.out.println("Creating folder2: " + fullName + " for user: " + this.getUser());
-=======
-			System.out.println("Creating folder: " + fullName + " for user: ");
->>>>>>> Fix issue #15.
-=======
 			System.out.println("Creating folder2: " + fullName + " for user: " + this.getUser());
->>>>>>> bind FolderListActivity to Singleton, otherwise it might create its view several times
 			delimiter = String.valueOf(folder.getSeparator());
 			iFolder = new ImapFolderImpl(fullName);
 			iFolder.setDelimiter(delimiter);
@@ -220,15 +158,7 @@ public class FetchFoldersServiceImpl ext
 			iFolder.setMessageCount(folder.getMessageCount());
 			iFolder.setSubscribed(folder.isSubscribed());
 			iFolder.setUnseenMessageCount(folder.getUnreadMessageCount());
-<<<<<<< HEAD
-<<<<<<< HEAD
-			if (folder.list().length != 0) {
-=======
-			if(folder.list().length != 0){
->>>>>>> Fix issue #15.
-=======
 			if (folder.list().length != 0) {
->>>>>>> pull all folders for label settings
 				iFolder.setHasChildren(true);
 			}
 		} catch (MessagingException e) {

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.io.IOException;
@@ -53,14 +44,7 @@ import org.apache.hupa.shared.domain.Fet
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Tag;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.google.inject.Inject;
 import com.sun.mail.imap.IMAPStore;
@@ -69,27 +53,11 @@ public abstract class FetchMessagesBaseS
 
     @Inject protected UserPreferencesStorage userPreferences;
     
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{
-        User user = getUser();
-        ImapFolder folder = action.getFolder();
-        if (folder == null) {
-            folder = new ImapFolderImpl(user.getSettings().getInboxFolderName());
-=======
-    public FetchMessagesResult fetch(FetchMessagesAction action){
-=======
     public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{
->>>>>>> re-add server unit tests
         User user = getUser();
         ImapFolder folder = action.getFolder();
         if (folder == null) {
-<<<<<<< HEAD
-            folder = (ImapFolder)new ImapFolderImpl(user.getSettings().getInboxFolderName());
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
             folder = new ImapFolderImpl(user.getSettings().getInboxFolderName());
->>>>>>> forward and reply message to use RF
         }
         com.sun.mail.imap.IMAPFolder f = null;
         int start = action.getStart();

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import java.util.List;
@@ -36,30 +31,4 @@ import org.apache.hupa.shared.exception.
 public interface FetchMessagesService {
 	FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException;
 	List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import java.util.List;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-
-import org.apache.hupa.shared.domain.FetchMessagesAction;
-import org.apache.hupa.shared.domain.FetchMessagesResult;
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface FetchMessagesService {
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public FetchMessagesResult fetch(FetchMessagesAction action);
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
-	FetchMessagesResult fetch(FetchMessagesAction action);
->>>>>>> Succeed creating new folder
-=======
-	FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException;
-	List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException;
->>>>>>> re-add server unit tests
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -35,106 +31,18 @@ import javax.mail.Multipart;
 import javax.mail.Part;
 import javax.mail.UIDFolder;
 import javax.mail.internet.MimeMessage.RecipientType;
-<<<<<<< HEAD
-=======
-package org.apache.hupa.server.service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
->>>>>>> fix some bugs related to RF, and try to use new CellView to replace gwt-incubator 
 import javax.mail.search.BodyTerm;
 import javax.mail.search.FromStringTerm;
 import javax.mail.search.OrTerm;
 import javax.mail.search.SearchTerm;
 import javax.mail.search.SubjectTerm;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fix some bugs related to RF, and try to use new CellView to replace gwt-incubator 
 import org.apache.hupa.server.handler.JavamailUtil;
 import org.apache.hupa.server.preferences.UserPreferencesStorage;
 import org.apache.hupa.server.utils.MessageUtils;
 import org.apache.hupa.shared.data.FetchMessagesResultImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
-import org.apache.hupa.shared.data.TagImpl;
-import org.apache.hupa.shared.domain.FetchMessagesAction;
-import org.apache.hupa.shared.domain.FetchMessagesResult;
-import org.apache.hupa.shared.domain.Tag;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.exception.HupaException;
-
-import com.google.inject.Inject;
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-
-public class FetchMessagesServiceImpl extends AbstractService implements FetchMessagesService{
-
-
-    @Inject protected UserPreferencesStorage userPreferences;
-    
-    public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{
-        User user = getUser();
-//        ImapFolder folder = action.getFolder();
-        if (action.getFolder() == null) {
-//            folder = new ImapFolderImpl(user.getSettings().getInboxFolderName());
-        	throw new IllegalArgumentException("why you want to ask us for messages in a null folder");
-        }
-        com.sun.mail.imap.IMAPFolder f = null;
-        int start = action.getStart();
-        int offset = action.getOffset();
-        try {
-            IMAPStore store = cache.get(user);
-            
-            f =  (com.sun.mail.imap.IMAPFolder)store.getFolder(action.getFolder().getFullName());
-
-             // check if the folder is open, if not open it read only
-            if (f.isOpen() == false) {
-                f.open(com.sun.mail.imap.IMAPFolder.READ_ONLY);
-            }
-
-            // if the folder is empty we have no need to process 
-            int exists = f.getMessageCount();
-            if (exists == 0) {
-                 return new FetchMessagesResultImpl(new ArrayList<org.apache.hupa.shared.domain.Message>(), start, offset, 0, 0);
-            }        
-            
-            MessageConvertArray convArray = getMessagesToConvert(f,action);
-            return new FetchMessagesResultImpl(convert(offset, f, convArray.getMesssages()),start, offset,convArray.getRealCount(),f.getUnreadMessageCount());
-        } catch (MessagingException e) {
-            logger.info("Error fetching messages in folder: " + action.getFolder().getFullName() + " " + e.getMessage());
-            // Folder can not contain messages
-            return new FetchMessagesResultImpl(new ArrayList<org.apache.hupa.shared.domain.Message>(), start, offset, 0, 0);
-        } finally {
-            if (f != null && f.isOpen()) {
-                try {
-                    f.close(false);
-                } catch (MessagingException e) {
-                    // we don't care to much about an exception on close here...
-                }
-            }
-        }
-    }
-
-
-    protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException, HupaException {
-=======
-=======
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.data.TagImpl;
-import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
->>>>>>> fix some bugs related to RF, and try to use new CellView to replace gwt-incubator 
-=======
 import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
 import org.apache.hupa.shared.data.TagImpl;
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 import org.apache.hupa.shared.domain.FetchMessagesAction;
 import org.apache.hupa.shared.domain.FetchMessagesResult;
 import org.apache.hupa.shared.domain.Tag;
@@ -194,12 +102,7 @@ public class FetchMessagesServiceImpl ex
     }
 
 
-<<<<<<< HEAD
-    protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException {
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
     protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException, HupaException {
->>>>>>> re-add server unit tests
         
         String searchString = action.getSearchString();
         int start = action.getStart();
@@ -253,16 +156,7 @@ public class FetchMessagesServiceImpl ex
         return new MessageConvertArray(exists, messages);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException {
-=======
-    protected List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException {
->>>>>>> fix some bugs related to RF, and try to use new CellView to replace gwt-incubator 
-=======
     public List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException {
->>>>>>> re-add server unit tests
         List<org.apache.hupa.shared.domain.Message> mList = new ArrayList<org.apache.hupa.shared.domain.Message>();
         // Setup fetchprofile to limit the stuff which is fetched 
         FetchProfile fp = new FetchProfile();
@@ -394,9 +288,4 @@ public class FetchMessagesServiceImpl ex
             return messages;
         }
     }
-<<<<<<< HEAD
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
->>>>>>> fix some bugs related to RF, and try to use new CellView to replace gwt-incubator 
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> try to get message details, problem is:
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> try to get message details, problem is:
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import static org.apache.hupa.server.utils.RegexPatterns.regex_badAttrs;
@@ -131,14 +122,6 @@ public class GetMessageDetailsServiceImp
 
 		boolean isHTML = MessageUtils.handleParts(message, content, sbPlain, attachmentList);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-		System.out.println(isHTML);
-
->>>>>>> try to get message details, problem is:
-=======
->>>>>>> re-add server unit tests
 		if (isHTML) {
 			mDetails.setText(filterHtmlDocument(sbPlain.toString(), folderName, uid));
 		} else {

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import javax.mail.MessagingException;
@@ -33,24 +28,5 @@ import org.apache.hupa.shared.exception.
 public interface IdleService {
 
 	IdleResult idle(IdleAction action) throws HupaException, MessagingException;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import javax.mail.MessagingException;
-
-import org.apache.hupa.shared.domain.IdleAction;
-import org.apache.hupa.shared.domain.IdleResult;
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface IdleService {
-
-<<<<<<< HEAD
-	IdleResult idle(IdleAction action) throws Exception;
->>>>>>> other RFs
-=======
-	IdleResult idle(IdleAction action) throws HupaException, MessagingException;
->>>>>>> re-add server unit tests
 
 }

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import javax.mail.MessagingException;
@@ -30,35 +25,12 @@ 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;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import javax.mail.MessagingException;
-
-import org.apache.hupa.shared.data.IdleResultImpl;
-import org.apache.hupa.shared.domain.IdleAction;
-import org.apache.hupa.shared.domain.IdleResult;
-<<<<<<< HEAD
->>>>>>> other RFs
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPStore;
 
 public class IdleServiceImpl extends AbstractService implements IdleService {
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public IdleResult idle(IdleAction action) throws HupaException, MessagingException {
-=======
-	public IdleResult idle(IdleAction action) throws Exception {
->>>>>>> other RFs
-=======
 	public IdleResult idle(IdleAction action) throws HupaException, MessagingException {
->>>>>>> re-add server unit tests
 		try {
 			IMAPStore store = cache.get(getUser());
 
@@ -72,18 +44,8 @@ public class IdleServiceImpl extends Abs
 				}
 			}
 			return new IdleResultImpl(true);
-<<<<<<< HEAD
-<<<<<<< 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
-=======
 		} catch (HupaException e) {
 			throw new HupaException("Unable to send NOOP " + e.getMessage());
->>>>>>> re-add server unit tests
 		}
 	}
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,17 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Allow client can use the domain entity interface.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.util.ArrayList;
 import java.util.List;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 import javax.mail.Folder;
 import javax.mail.MessagingException;
@@ -97,7 +86,6 @@ public class ImapFolderServiceImpl exten
 		ImapFolder iFolder = null;
 
 		try {
-<<<<<<< HEAD
 			delimiter = String.valueOf(folder.getSeparator());
 			iFolder = new ImapFolderImpl(fullName);
 			iFolder.setDelimiter(delimiter);
@@ -112,161 +100,4 @@ public class ImapFolderServiceImpl exten
 
 		return iFolder;
 	}
-=======
-import java.util.Properties;
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-
-import javax.mail.Folder;
-import javax.mail.MessagingException;
-
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.domain.ImapFolder;
-import org.apache.hupa.shared.domain.User;
-
-import com.sun.mail.imap.IMAPStore;
-
-public class ImapFolderServiceImpl extends AbstractService implements ImapFolderService {
-
-
-	public List<ImapFolder> requestFolders() throws Exception {
-		User user = getUser();
-		try {
-			IMAPStore store = cache.get(user);
-			com.sun.mail.imap.IMAPFolder folder = (com.sun.mail.imap.IMAPFolder) store.getDefaultFolder();
-			
-			// List of mail 'root' imap folders 
-			List<ImapFolder> imapFolders = new ArrayList<ImapFolder>();
-			// Create IMAPFolder tree list
-			for (Folder f : folder.list()) {
-				ImapFolder imapFolder = createIMAPFolder(f);
-				imapFolders.add(imapFolder);
-				walkFolders(f, imapFolder);
-			}
-			return imapFolders;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new Exception("Unable to get folders for User " + user);
-		}
-	}
-
-<<<<<<< HEAD
-    /**
-     * Walk through the folder's sub-folders and add sub-folders to current imapFolder
-     *   
-     * @param folder Folder to walk
-     * @param imapFolder Current IMAPFolder
-     * @throws ActionException If an error occurs
-     * @throws MessagingException If an error occurs
-     */
-    private void walkFolders(Folder folder, ImapFolder imapFolder) throws  MessagingException{
-        for (Folder f : folder.list()) {
-        	ImapFolder iFolder = createIMAPFolder(f);
-            imapFolder.getChildren().add(iFolder);
-            walkFolders(f, iFolder);
-        }
-    }
-
-    /**
-     * Create a new IMAPFolder from the given Folder
-     * 
-     * @param folder Current folder
-     * @return imapFolder Created IMAPFolder
-     * @throws ActionException If an error occurs
-     * @throws MessagingException If an error occurs
-     */
-    private ImapFolder createIMAPFolder(Folder folder){
-
-        String fullName = folder.getFullName();
-        String delimiter;
-        ImapFolder iFolder = null;
-        
-        try {
-            System.out.println("Creating folder: " + fullName + " for user: ");
-            delimiter = String.valueOf(folder.getSeparator());
-            iFolder = (ImapFolder)new ImapFolderImpl(fullName);
-            iFolder.setDelimiter(delimiter);
-            if("[Gmail]".equals(folder.getFullName()))
-                return iFolder;
-            iFolder.setMessageCount(folder.getMessageCount());
-            iFolder.setSubscribed(folder.isSubscribed());
-            iFolder.setUnseenMessageCount(folder.getUnreadMessageCount());
-        } catch (MessagingException e) {
-        	e.printStackTrace();
-        }
-        
-        return iFolder;
-    }
->>>>>>> Allow client can use the domain entity interface.
-=======
-	/**
-	 * Walk through the folder's sub-folders and add sub-folders to current
-	 * imapFolder
-	 * 
-	 * @param folder Folder to walk
-	 * @param imapFolder Current IMAPFolder
-	 * @throws MessagingException If an error occurs
-	 */
-	private void walkFolders(Folder folder, ImapFolder imapFolder) throws MessagingException {
-		for (Folder f : folder.list()) {
-			ImapFolder iFolder = createIMAPFolder(f);
-			imapFolder.getChildren().add(iFolder);
-			walkFolders(f, iFolder);
-		}
-	}
-
-	/**
-	 * Create a new IMAPFolder from the given Folder
-	 * 
-	 * @param folder Current folder
-	 * @return imapFolder Created IMAPFolder
-	 * @throws Exception If an error occurs
-	 * @throws MessagingException If an error occurs
-	 */
-	private ImapFolder createIMAPFolder(Folder folder) {
-
-		String fullName = folder.getFullName();
-		String delimiter;
-		ImapFolder iFolder = null;
-
-		try {
-			System.out.println("Creating folder: " + fullName + " for user: ");
-=======
->>>>>>> bind FolderListActivity to Singleton, otherwise it might create its view several times
-			delimiter = String.valueOf(folder.getSeparator());
-			iFolder = new ImapFolderImpl(fullName);
-			iFolder.setDelimiter(delimiter);
-			if ("[Gmail]".equals(folder.getFullName()))
-				return iFolder;
-			iFolder.setMessageCount(folder.getMessageCount());
-			iFolder.setSubscribed(folder.isSubscribed());
-			iFolder.setUnseenMessageCount(folder.getUnreadMessageCount());
-		} catch (MessagingException e) {
-			e.printStackTrace();
-		}
-
-		return iFolder;
-	}
-<<<<<<< HEAD
-
-	public String toString() {
-		StringBuffer ret = new StringBuffer("");
-		for (ImapFolder folder : imapFolders) {
-			ret.append(folder.getFullName()).append("\n");
-			for (ImapFolder f : folder.getChildren()) {
-				childFolder(f, ret);
-			}
-		}
-		return ret.toString();
-	}
-
-	private void childFolder(ImapFolder child, StringBuffer ret) {
-		ret.append(child.getFullName()).append("\n");
-		for (ImapFolder folder : child.getChildren()) {
-			childFolder(folder, ret);
-		}
-	}
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior.
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import javax.mail.MessagingException;
@@ -31,25 +26,4 @@ import org.apache.hupa.shared.exception.
 
 public interface LoginUserService {
 	public User login(String username, String password) throws HupaException, MessagingException;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import javax.mail.MessagingException;
-
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface LoginUserService {
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public User login(String username, String password);
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-	public User login(String username, String password) throws Exception;
->>>>>>> alert people "invilid login" for the wrong username and/or password, which should be improved with a gentle way
-=======
-	public User login(String username, String password) throws HupaException, MessagingException;
->>>>>>> re-add server unit tests
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,43 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpSession;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import javax.mail.MessagingException;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 
-=======
->>>>>>> alert people "invilid login" for the wrong username and/or password, which should be improved with a gentle way
-=======
-import javax.servlet.http.HttpSession;
-
->>>>>>> fix issue 5,6,8:
 import org.apache.hupa.server.utils.SessionUtils;
 import org.apache.hupa.shared.SConsts;
 import org.apache.hupa.shared.data.UserImpl;
 import org.apache.hupa.shared.domain.Settings;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
 import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -66,44 +36,13 @@ public class LoginUserServiceImpl extend
 
 	@Inject private Provider<Settings> settingsProvider;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public User login(String username, String password) throws HupaException, MessagingException {
-		HttpSession httpSession = httpSessionProvider.get();
-        SessionUtils.cleanSessionAttributes(httpSession);
-		User user = new UserImpl();
-		user.setName(username);
-		user.setPassword(password);
-		cache.get(user);
-=======
-	public User login(String username, String password) {
-=======
-	public User login(String username, String password) throws Exception {
-<<<<<<< HEAD
->>>>>>> alert people "invilid login" for the wrong username and/or password, which should be improved with a gentle way
-		SessionUtils.cleanSessionAttributes(httpSession);
-=======
-=======
 	public User login(String username, String password) throws HupaException, MessagingException {
->>>>>>> re-add server unit tests
 		HttpSession httpSession = httpSessionProvider.get();
         SessionUtils.cleanSessionAttributes(httpSession);
->>>>>>> fix issue 5,6,8:
 		User user = new UserImpl();
 		user.setName(username);
 		user.setPassword(password);
-<<<<<<< HEAD
-		try {
-			cache.get(user);
-		} catch (Exception e) {
-			logger.error("Unable to authenticate user: " + username, e);
-			throw e;
-		}
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
 		cache.get(user);
->>>>>>> re-add server unit tests
 		user.setAuthenticated(true);
 		user.setSettings(settingsProvider.get());
 		httpSession.setAttribute(SConsts.USER_SESS_ATTR, user);

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.domain.LogoutUserResult;
@@ -29,19 +24,4 @@ import org.apache.hupa.shared.exception.
 
 public interface LogoutUserService {
 	LogoutUserResult logout() throws HupaException;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import org.apache.hupa.shared.domain.LogoutUserResult;
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface LogoutUserService {
-<<<<<<< HEAD
-	LogoutUserResult logout();
->>>>>>> other RFs
-=======
-	LogoutUserResult logout() throws HupaException;
->>>>>>> re-add server unit tests
 }

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,37 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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
-<<<<<<< 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
-=======
-import org.apache.hupa.shared.exception.HupaException;
-
-public class LogoutUserServiceImpl extends AbstractService implements LogoutUserService {
-	@Override
-	public LogoutUserResult logout() throws HupaException {
->>>>>>> re-add server unit tests
 
 		User user = getUser();
 		user.setAuthenticated(false);
@@ -60,15 +36,7 @@ public class LogoutUserServiceImpl exten
 		cache.delete(user);
 
 		// remove user attributes from session
-<<<<<<< HEAD
-<<<<<<< HEAD
-		SessionUtils.cleanSessionAttributes(httpSessionProvider.get());
-=======
-		SessionUtils.cleanSessionAttributes(httpSession);
->>>>>>> other RFs
-=======
 		SessionUtils.cleanSessionAttributes(httpSessionProvider.get());
->>>>>>> fix issue 5,6,8:
 
 		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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import javax.mail.Flags;

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete and rename folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete and rename folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import javax.mail.Folder;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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/SendForwardMessageServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.io.IOException;
@@ -41,14 +32,7 @@ import org.apache.hupa.server.preference
 import org.apache.hupa.server.utils.MessageUtils;
 import org.apache.hupa.shared.domain.SendForwardMessageAction;
 import org.apache.hupa.shared.domain.SendMessageAction;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> forward and reply message to use RF
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
@@ -65,15 +49,7 @@ public class SendForwardMessageServiceIm
 
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
-<<<<<<< HEAD
-<<<<<<< HEAD
-    protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
-=======
-    protected List getAttachments(SendMessageAction action) throws MessagingException {
->>>>>>> forward and reply message to use RF
-=======
     protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
->>>>>>> re-add server unit tests
     	SendForwardMessageAction forwardAction = (SendForwardMessageAction)action;
         List<?> items = new ArrayList();
         IMAPStore store = cache.get(getUser());
@@ -83,15 +59,7 @@ public class SendForwardMessageServiceIm
             folder.open(Folder.READ_ONLY);
         }
         // Put the original attachments in the list 
-<<<<<<< HEAD
-<<<<<<< HEAD
-        Message msg = folder.getMessageByUID(forwardAction.getUid());
-=======
-        Message msg = folder.getMessageByUID(forwardAction.getReplyMessageUid());
->>>>>>> forward and reply message to use RF
-=======
         Message msg = folder.getMessageByUID(forwardAction.getUid());
->>>>>>> fixed the requestfactory's quirk
         try {
             items = MessageUtils.extractMessageAttachments(logger, msg.getContent());
             logger.debug("Forwarding a message, extracted: " + items.size() + " from original.");

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.io.File;
@@ -53,14 +44,6 @@ import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMessage.RecipientType;
 import javax.mail.internet.MimeMultipart;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import net.customware.gwt.dispatch.shared.ActionException;
-
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 import org.apache.commons.fileupload.FileItem;
 import org.apache.hupa.server.FileItemRegistry;
 import org.apache.hupa.server.IMAPStoreCache;
@@ -75,14 +58,7 @@ import org.apache.hupa.shared.domain.Mes
 import org.apache.hupa.shared.domain.SendMessageAction;
 import org.apache.hupa.shared.domain.SmtpMessage;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> forward and reply message to use RF
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
@@ -152,13 +128,6 @@ public class SendMessageBaseServiceImpl 
      * @return message
      * @throws AddressException
      * @throws MessagingException
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-     * @throws ActionException
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
      */
     protected Message createMessage(Session session, SendMessageAction action) throws AddressException, MessagingException {
         MimeMessage message = new MimeMessage(session);
@@ -172,17 +141,8 @@ public class SendMessageBaseServiceImpl 
         message.setRecipients(RecipientType.TO, MessageUtils.getRecipients(m.getTo()));
         message.setRecipients(RecipientType.CC, MessageUtils.getRecipients(m.getCc()));
         message.setRecipients(RecipientType.BCC, MessageUtils.getRecipients(m.getBcc()));
-<<<<<<< HEAD
-<<<<<<< HEAD
 //        message.setSubject(MessageUtils.encodeTexts(m.getSubject()));
         message.setSubject(m.getSubject(), "utf-8");
-=======
-        message.setSubject(MessageUtils.encodeTexts(m.getSubject()));
->>>>>>> forward and reply message to use RF
-=======
-//        message.setSubject(MessageUtils.encodeTexts(m.getSubject()));
-        message.setSubject(m.getSubject(), "utf-8");
->>>>>>> make send text mail work excellently
         updateHeaders(message, action);
         message.saveChanges();
         return message;
@@ -212,25 +172,10 @@ public class SendMessageBaseServiceImpl 
      * @param action the action
      * @return filledMessage
      * @throws MessagingException
-<<<<<<< HEAD
-<<<<<<< HEAD
-     * @throws IOException 
-	 * @throws HupaException 
-     */
-    protected Message fillBody(Message message, SendMessageAction action) throws MessagingException, IOException, HupaException {
-=======
-     * @throws ActionException
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
      * @throws IOException 
 	 * @throws HupaException 
      */
-<<<<<<< HEAD
-    protected Message fillBody(Message message, SendMessageAction action) throws MessagingException, IOException {
->>>>>>> forward and reply message to use RF
-=======
     protected Message fillBody(Message message, SendMessageAction action) throws MessagingException, IOException, HupaException {
->>>>>>> re-add server unit tests
 
         String html = restoreInlineLinks(action.getMessage().getText());
         
@@ -265,29 +210,11 @@ public class SendMessageBaseServiceImpl 
      * 
      * @param action
      * @return A list of stored attachments
-<<<<<<< HEAD
-<<<<<<< HEAD
      * @throws HupaException 
      */
     @SuppressWarnings("rawtypes")
     protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
         FileItemRegistry registry = SessionUtils.getSessionRegistry(logger, httpSessionProvider.get());
-=======
-     */
-    @SuppressWarnings("rawtypes")
-    protected List getAttachments(SendMessageAction action) throws MessagingException {
-<<<<<<< HEAD
-        FileItemRegistry registry = SessionUtils.getSessionRegistry(logger, httpSession);
->>>>>>> forward and reply message to use RF
-=======
-=======
-     * @throws HupaException 
-     */
-    @SuppressWarnings("rawtypes")
-    protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
->>>>>>> re-add server unit tests
-        FileItemRegistry registry = SessionUtils.getSessionRegistry(logger, httpSessionProvider.get());
->>>>>>> fix issue 5,6,8:
         List<MessageAttachment> attachments = action.getMessage().getMessageAttachments();
         
         ArrayList<FileItem> items = new ArrayList<FileItem>();
@@ -314,15 +241,7 @@ public class SendMessageBaseServiceImpl 
         List<MessageAttachment> attachments = msg.getMessageAttachments();
         if (attachments != null && ! attachments.isEmpty()) {
             for(MessageAttachment attach : attachments) 
-<<<<<<< HEAD
-<<<<<<< HEAD
-                SessionUtils.getSessionRegistry(logger, httpSessionProvider.get()).remove(attach.getName());
-=======
-                SessionUtils.getSessionRegistry(logger, httpSession).remove(attach.getName());
->>>>>>> forward and reply message to use RF
-=======
                 SessionUtils.getSessionRegistry(logger, httpSessionProvider.get()).remove(attach.getName());
->>>>>>> fix issue 5,6,8:
         }
     }
     

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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/SendReplyMessageService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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/SendReplyMessageServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.io.IOException;
@@ -41,14 +32,7 @@ import org.apache.hupa.server.preference
 import org.apache.hupa.server.utils.MessageUtils;
 import org.apache.hupa.shared.domain.SendMessageAction;
 import org.apache.hupa.shared.domain.SendReplyMessageAction;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> forward and reply message to use RF
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
@@ -65,15 +49,7 @@ public class SendReplyMessageServiceImpl
 
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
-<<<<<<< HEAD
-<<<<<<< HEAD
-    protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
-=======
-    protected List getAttachments(SendMessageAction action) throws MessagingException {
->>>>>>> forward and reply message to use RF
-=======
     protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
->>>>>>> re-add server unit tests
     	SendReplyMessageAction replyAction = (SendReplyMessageAction)action;
         List<?> items = new ArrayList();
         IMAPStore store = cache.get(getUser());
@@ -84,15 +60,7 @@ public class SendReplyMessageServiceImpl
         }
 
         // Only original inline images have to be added to the list 
-<<<<<<< HEAD
-<<<<<<< HEAD
-        Message msg = folder.getMessageByUID(replyAction.getUid());
-=======
-        Message msg = folder.getMessageByUID(replyAction.getReplyMessageUid());
->>>>>>> forward and reply message to use RF
-=======
         Message msg = folder.getMessageByUID(replyAction.getUid());
->>>>>>> fixed the requestfactory's quirk
         try {
             items = MessageUtils.extractInlineImages(logger, msg.getContent());
             if (items.size() > 0)

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import java.util.List;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java Mon Sep 23 07:04:08 2013
@@ -38,19 +38,7 @@ import org.apache.commons.logging.Log;
 import org.apache.hupa.server.IMAPStoreCache;
 import org.apache.hupa.server.utils.MessageUtils;
 import org.apache.hupa.shared.SConsts;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.domain.User;
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.domain.User;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 
 import com.google.inject.Inject;
 import com.sun.mail.imap.IMAPFolder;
@@ -91,31 +79,12 @@ public class DownloadAttachmentServlet e
         String message_uuid = request.getParameter(SConsts.PARAM_UID);
         String attachmentName = request.getParameter(SConsts.PARAM_NAME);
         String folderName = request.getParameter(SConsts.PARAM_FOLDER);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        String mode = request.getParameter(SConsts.PARAM_MODE);
-        boolean inline = "inline".equals(mode);
-        if (!inline) {
-	    response.setHeader("Content-disposition", "attachment; filename="
-	        + attachmentName + "");
-        }
-=======
-        response.setHeader("Content-disposition", "attachment; filename="
-                + attachmentName + "");
->>>>>>> first commit
-=======
-        response.setHeader("Content-disposition", "attachment; filename="
-                + attachmentName + "");
->>>>>>> first commit
-=======
         String mode = request.getParameter(SConsts.PARAM_MODE);
         boolean inline = "inline".equals(mode);
         if (!inline) {
 	    response.setHeader("Content-disposition", "attachment; filename="
 	        + attachmentName + "");
         }
->>>>>>> merged with main trunk in apache: replacing rounded borders with gwt decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
         InputStream in = null;
         OutputStream out = response.getOutputStream();
 
@@ -137,25 +106,11 @@ public class DownloadAttachmentServlet e
 
             in = part.getInputStream();
             if (in != null) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Fix issue in chrome with inlined images in messages
                 // FIXME: for some reason Chrome does not display inline images when they have the content-length
                 // it's like the size reported in server is different than the received bytes.
                 if (!inline) {
                     response.setContentLength(part.getSize());
                 }
-<<<<<<< HEAD
-=======
-                response.setContentLength(part.getSize());
->>>>>>> first commit
-=======
-                response.setContentLength(part.getSize());
->>>>>>> first commit
-=======
->>>>>>> Fix issue in chrome with inlined images in messages
                 IOUtils.copy(in, out);
             } else {
                 response.setContentLength(0);

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java Mon Sep 23 07:04:08 2013
@@ -31,32 +31,9 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.server.IMAPStoreCache;
 import org.apache.hupa.shared.SConsts;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-=======
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
-=======
-import org.apache.hupa.server.IMAPStoreCache;
->>>>>>> constantly changed by manolo
-import org.apache.hupa.shared.SConsts;
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
-=======
-import org.apache.hupa.server.IMAPStoreCache;
->>>>>>> constantly changed by manolo
-import org.apache.hupa.shared.SConsts;
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 
 import com.google.inject.Inject;
 import com.sun.mail.imap.IMAPFolder;
@@ -68,41 +45,11 @@ import com.sun.mail.imap.IMAPStore;
 public class MessageSourceServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1245563204035792963L;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     private IMAPStoreCache cache;
     private Log logger;
 
     @Inject
     public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
-=======
-=======
->>>>>>> first commit
-    private InMemoryIMAPStoreCache cache;
-    private Log logger;
-
-    @Inject
-    public MessageSourceServlet(InMemoryIMAPStoreCache cache, Log logger) {
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-    private IMAPStoreCache cache;
-    private Log logger;
-
-    @Inject
-    public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-    private IMAPStoreCache cache;
-    private Log logger;
-
-    @Inject
-    public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
->>>>>>> constantly changed by manolo
         this.cache = cache;
         this.logger = logger;
     }
@@ -140,23 +87,7 @@ public class MessageSourceServlet extend
         } catch (Exception e) {
             String msg = "Unable to get raw content of msg for user " + user + " in folder " + folderName + " with uid " + message_uuid;
             logger.error(msg, e);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-            throw new ServletException(msg, e);
-=======
-            throw new ServletException(msg);
->>>>>>> first commit
-=======
-            throw new ServletException(msg, e);
->>>>>>> constantly changed by manolo
-=======
-            throw new ServletException(msg);
->>>>>>> first commit
-=======
             throw new ServletException(msg, e);
->>>>>>> constantly changed by manolo
         } finally {
             IOUtils.closeQuietly(outs);
         }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java Mon Sep 23 07:04:08 2013
@@ -53,25 +53,7 @@ public enum ConfigurationProperties {
 
     // Used only in demo mode
     USERNAME("Username", false, null),
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     PASSWORD("Password", false, null);
-=======
-    PASSWORD("Password", false, null),
-    SESSIONID("DefaultUserSessionId", false, null);
->>>>>>> first commit
-=======
-    PASSWORD("Password", false, null);
->>>>>>> constantly changed by manolo
-=======
-    PASSWORD("Password", false, null),
-    SESSIONID("DefaultUserSessionId", false, null);
->>>>>>> first commit
-=======
-    PASSWORD("Password", false, null);
->>>>>>> constantly changed by manolo
     
     private String property;
     private boolean mandatory;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message