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 [11/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/utils/MessageUtils.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java Mon Sep 23 07:04:08 2013
@@ -19,49 +19,16 @@
 
 package org.apache.hupa.server.utils;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.io.File;
 import java.io.IOException;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.io.InputStream;
 import java.io.OutputStream;
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
-=======
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
@@ -79,22 +46,8 @@ import javax.mail.internet.MimeUtility;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.logging.Log;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.server.handler.AbstractSendMessageHandler;
->>>>>>> first commit
-=======
-import org.apache.hupa.server.handler.AbstractSendMessageHandler;
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-=======
 import org.apache.hupa.shared.data.MessageAttachmentImpl;
 import org.apache.hupa.shared.domain.MessageAttachment;
->>>>>>> Move method to Util class
 
 
 
@@ -127,23 +80,7 @@ public class MessageUtils {
         }
         Address[] array = new Address[recipients.size()];
         for (int i = 0; i < recipients.size(); i++) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-            array[i] = new InternetAddress(encodeEmail(recipients.get(i)));
-=======
-            array[i] = new InternetAddress(recipients.get(i));
->>>>>>> first commit
-=======
-            array[i] = new InternetAddress(encodeEmail(recipients.get(i)));
->>>>>>> constantly changed by manolo
-=======
-            array[i] = new InternetAddress(recipients.get(i));
->>>>>>> first commit
-=======
             array[i] = new InternetAddress(encodeEmail(recipients.get(i)));
->>>>>>> constantly changed by manolo
         }
         return array;
     }
@@ -340,28 +277,11 @@ public class MessageUtils {
      */
     public static BodyPart fileitemToBodypart(FileItem item) throws MessagingException {
         MimeBodyPart messageBodyPart = new MimeBodyPart();
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
         DataSource source = new FileItemDataStore(item);
-=======
-        DataSource source = new AbstractSendMessageHandler.FileItemDataStore(item);
->>>>>>> first commit
-=======
-        DataSource source = new AbstractSendMessageHandler.FileItemDataStore(item);
->>>>>>> first commit
-=======
-        DataSource source = new FileItemDataStore(item);
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
         messageBodyPart.setDataHandler(new DataHandler(source));
         messageBodyPart.setFileName(source.getName());
         return messageBodyPart;
     }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 
     /**
      * DataStore which wrap a FileItem
@@ -416,110 +336,6 @@ public class MessageUtils {
         }
 
     }  
-<<<<<<< HEAD
-    /**
-     * Decode iso-xxxx strings present in subjects and emails like:
-     * 
-     * =?ISO-8859-1?Q?No=20hay=20ma=F1ana?= <hello@hupa.org> 
-     */
-    public static String decodeText(String s) {
-        String ret = s;
-        try {
-            ret = MimeUtility.decodeText(s);
-        } catch (UnsupportedEncodingException e) {
-            System.out.println(e.getMessage());
-        }
-        ret =  ret
-          // Remove quotes around names in email addresses
-          .replaceFirst("^[<\"' ]+([^\"<>]*)[>\"' ]+<", "$1 <");
-        return ret;
-    }
-    
-    /**
-     * Encode non ascii characters present in emails like:
-     * 
-     * =?ISO-8859-1?Q?No=20hay=20ma=F1ana?= <hello@hupa.org> 
-     */
-    public static String encodeEmail(String s) {
-        if (s == null) {
-            return s;
-        }
-        Pattern p = Pattern.compile("^\\s*(.*?)\\s*(<[^>]+>)\\s*");
-        Matcher m = p.matcher(s);
-        return m.matches() ? encodeTexts(m.group(1)) + " " + m.group(2) : s;
-    }
-    
-    /**
-     * Encode non ascii characters present in email headers
-     */
-    public static String encodeTexts(String s) {
-        String ret = s;
-        if (s != null) {
-            try {
-                ret = MimeUtility.encodeText(s, "ISO-8859-1", null);
-            } catch (UnsupportedEncodingException e) {
-            }
-        }
-        return ret;
-    }
-=======
-    
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-    /**
-     * Decode iso-xxxx strings present in subjects and emails like:
-     * 
-     * =?ISO-8859-1?Q?No=20hay=20ma=F1ana?= <hello@hupa.org> 
-     */
-    public static String decodeText(String s) {
-        String ret = s;
-        try {
-            ret = MimeUtility.decodeText(s);
-        } catch (UnsupportedEncodingException e) {
-            System.out.println(e.getMessage());
-        }
-        ret =  ret
-          // Remove quotes around names in email addresses
-          .replaceFirst("^[<\"' ]+([^\"<>]*)[>\"' ]+<", "$1 <");
-        return ret;
-    }
-    
-    /**
-     * Encode non ascii characters present in emails like:
-     * 
-     * =?ISO-8859-1?Q?No=20hay=20ma=F1ana?= <hello@hupa.org> 
-     */
-    public static String encodeEmail(String s) {
-        if (s == null) {
-            return s;
-        }
-        Pattern p = Pattern.compile("^\\s*(.*?)\\s*(<[^>]+>)\\s*");
-        Matcher m = p.matcher(s);
-        return m.matches() ? encodeTexts(m.group(1)) + " " + m.group(2) : s;
-    }
-    
-    /**
-     * Encode non ascii characters present in email headers
-     */
-    public static String encodeTexts(String s) {
-        String ret = s;
-        if (s != null) {
-            try {
-                ret = MimeUtility.encodeText(s, "ISO-8859-1", null);
-            } catch (UnsupportedEncodingException e) {
-            }
-        }
-        return ret;
-    }
->>>>>>> constantly changed by manolo
-=======
-    
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
     /**
      * Decode iso-xxxx strings present in subjects and emails like:
      * 
@@ -565,5 +381,4 @@ public class MessageUtils {
         }
         return ret;
     }
->>>>>>> constantly changed by manolo
 }
\ No newline at end of file

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java Mon Sep 23 07:04:08 2013
@@ -48,21 +48,8 @@ public class RegexPatterns {
     
     public static final Pattern regex_inlineImg = Pattern.compile("(?si)(<\\s*img\\s+.*?src=)[\"']?cid:([^\"']+)[\"']?");
     public static final String repl_inlineImg = "$1'" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
                                         + "?" + SConsts.PARAM_MODE + "=inline" 
                                         + "&" + SConsts.PARAM_FOLDER + "=%%FOLDER%%" 
-=======
-                                        + "?" + SConsts.PARAM_FOLDER + "=%%FOLDER%%" 
->>>>>>> first commit
-=======
-                                        + "?" + SConsts.PARAM_FOLDER + "=%%FOLDER%%" 
->>>>>>> first commit
-=======
-                                        + "?" + SConsts.PARAM_MODE + "=inline" 
-                                        + "&" + SConsts.PARAM_FOLDER + "=%%FOLDER%%" 
->>>>>>> Fix issue in chrome with inlined images in messages
                                         + "&" + SConsts.PARAM_UID + "=%%UID%%" 
                                         + "&" + SConsts.PARAM_NAME + "=$2' name='cid:$2'";
     
@@ -113,16 +100,4 @@ public class RegexPatterns {
 //    s=s.replaceAll("[ \t]+", " ");
 
     
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> first commit
-=======
-}
->>>>>>> first commit
-=======
 }
->>>>>>> Fix issue in chrome with inlined images in messages

Modified: james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties (original)
+++ james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties Mon Sep 23 07:04:08 2013
@@ -15,23 +15,11 @@
 #    limitations under the License.
 #############################################################################
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fix the bug that there will throw a NullPointerException after the first time into the message view page and then click the back link given not click the folders names
 # The demo mode should make two lines different
 # 1. IMAPServerAddress=hupa.demo
 # 2. DefaultInboxFolder=Mock-Inbox
 # and then use the credential: demo/demo to login to the webmail through the browser
 
-<<<<<<< HEAD
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> fix the bug that there will throw a NullPointerException after the first time into the message view page and then click the back link given not click the folders names
 # The IP or domainname of the IMAP server
 IMAPServerAddress=imap.gmail.com
 # The port of the IMAP server

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java Mon Sep 23 07:04:08 2013
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -115,129 +110,3 @@ public class HupaGuiceTestCase{
         }
     }
 }
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-
-package org.apache.hupa.server;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-import com.sun.mail.imap.IMAPStore;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.hupa.server.guice.GuiceServerTestModule;
-import org.apache.hupa.server.handler.AbstractSendMessageHandler;
-import org.apache.hupa.server.handler.ContactsHandler;
-import org.apache.hupa.server.handler.CreateFolderHandler;
-import org.apache.hupa.server.handler.DeleteFolderHandler;
-import org.apache.hupa.server.handler.DeleteMessageByUidHandler;
-import org.apache.hupa.server.handler.FetchFoldersHandler;
-import org.apache.hupa.server.handler.FetchMessagesHandler;
-import org.apache.hupa.server.handler.ForwardMessageHandler;
-import org.apache.hupa.server.handler.GetMessageDetailsHandler;
-import org.apache.hupa.server.handler.IdleHandler;
-import org.apache.hupa.server.handler.LoginUserHandler;
-import org.apache.hupa.server.handler.LogoutUserHandler;
-import org.apache.hupa.server.handler.ReplyMessageHandler;
-import org.apache.hupa.server.handler.SendMessageHandler;
-import org.apache.hupa.server.preferences.UserPreferencesStorage;
-import org.apache.hupa.server.utils.SessionUtils;
-import org.apache.hupa.shared.SConsts;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.rpc.SendMessage;
-
-import javax.mail.Session;
-import javax.servlet.http.HttpSession;
-
-public abstract class HupaGuiceTestCase extends TestCase {
-
-    protected Injector injector = Guice.createInjector(getModules());
-    
-    protected ContactsHandler contactsHandler;
-    protected IdleHandler idleHandler;
-    protected CreateFolderHandler createFolderHandler;
-    protected DeleteFolderHandler deleteFolderHandler;
-    protected FetchFoldersHandler fetchFoldersHandler;
-    protected FetchMessagesHandler fetchMessagesHandler;
-    protected DeleteMessageByUidHandler deleteMessageByUidHandler;
-    protected AbstractSendMessageHandler<SendMessage> sendMessageHandler;
-    protected ForwardMessageHandler forwardMessageHandler;
-    protected GetMessageDetailsHandler getDetailsHandler;
-    protected Log logger;
-    protected LoginUserHandler loginUser;
-    protected LogoutUserHandler logoutUser;
-    protected ReplyMessageHandler reMsgHndl;
-    protected Session session;
-    protected IMAPStoreCache storeCache;
-    protected User testUser;
-    protected UserPreferencesStorage userPreferences;
-    protected IMAPStore store;
-    protected HttpSession httpSession;
-    
-    protected Module[] getModules() {
-        return new Module[]{new GuiceServerTestModule()};
-    }
-    
-    @Override
-    protected void setUp() throws Exception {
-        try {
-            contactsHandler = injector.getInstance(ContactsHandler.class);
-            idleHandler = injector.getInstance(IdleHandler.class);
-            createFolderHandler = injector.getInstance(CreateFolderHandler.class);
-            deleteFolderHandler = injector.getInstance(DeleteFolderHandler.class);
-            fetchFoldersHandler = injector.getInstance(FetchFoldersHandler.class);
-            fetchMessagesHandler = injector.getInstance(FetchMessagesHandler.class);
-            deleteMessageByUidHandler = injector.getInstance(DeleteMessageByUidHandler.class);
-            sendMessageHandler = injector.getInstance(SendMessageHandler.class);
-            forwardMessageHandler = injector.getInstance(ForwardMessageHandler.class);
-            getDetailsHandler = injector.getInstance(GetMessageDetailsHandler.class);
-            logger = injector.getInstance(Log.class);
-            loginUser = injector.getInstance(LoginUserHandler.class);
-            logoutUser = injector.getInstance(LogoutUserHandler.class);
-            reMsgHndl = injector.getInstance(ReplyMessageHandler.class);
-            session = injector.getInstance(Session.class);
-            storeCache = injector.getInstance(IMAPStoreCache.class);
-            userPreferences = injector.getInstance(UserPreferencesStorage.class);
-            
-            httpSession = injector.getInstance(HttpSession.class);
-            SessionUtils.cleanSessionAttributes(httpSession);
-            testUser = injector.getInstance(User.class);
-            store = storeCache.get(testUser);
-            httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
-            
-        } catch (Exception e) {
-        }
-    }
-
-}
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> re-add server unit tests

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java Mon Sep 23 07:04:08 2013
@@ -26,67 +26,16 @@ import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.hupa.server.IMAPStoreCache;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 import org.apache.hupa.server.InMemoryIMAPStoreCache;
 import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
 import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
 import org.apache.hupa.server.ioc.demo.DemoGuiceServerModule.DemoIMAPStoreCache;
-<<<<<<< HEAD
-=======
-=======
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
->>>>>>> constantly changed by manolo
-import org.apache.hupa.server.guice.demo.DemoGuiceServerModule.DemoIMAPStoreCache;
-import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
-import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
-import org.apache.hupa.server.handler.AbstractSendMessageHandler;
-import org.apache.hupa.server.handler.ContactsHandler;
-import org.apache.hupa.server.handler.CreateFolderHandler;
-import org.apache.hupa.server.handler.DeleteFolderHandler;
-import org.apache.hupa.server.handler.DeleteMessageByUidHandler;
-import org.apache.hupa.server.handler.FetchFoldersHandler;
-import org.apache.hupa.server.handler.FetchMessagesHandler;
-import org.apache.hupa.server.handler.ForwardMessageHandler;
-import org.apache.hupa.server.handler.GetMessageDetailsHandler;
-import org.apache.hupa.server.handler.IdleHandler;
-import org.apache.hupa.server.handler.LoginUserHandler;
-import org.apache.hupa.server.handler.LogoutUserHandler;
-import org.apache.hupa.server.handler.ReplyMessageHandler;
-import org.apache.hupa.server.handler.SendMessageHandler;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> re-add server unit tests
 import org.apache.hupa.server.mock.MockConstants;
 import org.apache.hupa.server.mock.MockHttpSessionProvider;
 import org.apache.hupa.server.mock.MockIMAPStore;
 import org.apache.hupa.server.mock.MockLogProvider;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
-import org.apache.hupa.server.preferences.UserPreferencesStorage;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
-=======
->>>>>>> remove warnings
 import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
 import org.apache.hupa.server.preferences.UserPreferencesStorage;
->>>>>>> re-add server unit tests
 import org.apache.hupa.server.service.CheckSessionServiceImpl;
 import org.apache.hupa.server.service.CreateFolderServiceImpl;
 import org.apache.hupa.server.service.DeleteFolderServiceImpl;
@@ -143,39 +92,10 @@ import org.apache.hupa.shared.domain.Set
 import org.apache.hupa.shared.domain.User;
 
 import com.google.inject.Provider;
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-import org.apache.hupa.server.utils.ConfigurationProperties;
-import org.apache.hupa.shared.domain.Settings;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.rpc.Contacts;
-import org.apache.hupa.shared.rpc.SendMessage;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-import com.google.inject.Provider;
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-import com.google.inject.Provider;
->>>>>>> constantly changed by manolo
-=======
->>>>>>> re-add server unit tests
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
 import com.sun.mail.imap.IMAPStore;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 public class GuiceServerTestModule extends AbstractGuiceTestModule {
 
     protected Class<? extends UserPreferencesStorage> userPreferencesStorageClass = InSessionUserPreferencesStorage.class;
@@ -268,115 +188,3 @@ public class GuiceServerTestModule exten
 	}
 
 }
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-/**
- * Guice module used in server tests.
- */
-public class GuiceServerTestModule extends AbstractGuiceTestModule {
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-    protected Class<? extends UserPreferencesStorage> userPreferencesStorageClass = InSessionUserPreferencesStorage.class;
-    protected Class<? extends Provider<Log>> logProviderClass = MockLogProvider.class;
-    protected Properties properties = MockConstants.mockProperties;
-
-    @Override
-    protected void configureHandlers() {
-        ConfigurationProperties.validateProperties(properties);
-        Names.bindProperties(binder(), properties);
-
-        bind(Session.class).toProvider(JavaMailSessionProvider.class);
-        bind(HttpSession.class).toProvider(MockHttpSessionProvider.class);
-        bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(
-                Singleton.class);
-        bind(Log.class).toProvider(logProviderClass).in(Singleton.class);
-
-        bind(IMAPStore.class).to(MockIMAPStore.class);
-
-        if (properties == MockConstants.mockProperties) {
-            bind(IMAPStoreCache.class).to(DemoIMAPStoreCache.class).in(
-                    Singleton.class);
-        } else {
-            bind(IMAPStoreCache.class).to(InMemoryIMAPStoreCache.class).in(
-                    Singleton.class);
-        }
-
-        bind(LoginUserHandler.class);
-        bind(LogoutUserHandler.class);
-        bind(IdleHandler.class);
-
-        bind(FetchFoldersHandler.class);
-        bind(CreateFolderHandler.class);
-        bind(DeleteFolderHandler.class);
-        bind(FetchMessagesHandler.class);
-        bind(DeleteMessageByUidHandler.class);
-        bind(GetMessageDetailsHandler.class);
-        bind(AbstractSendMessageHandler.class).to(SendMessageHandler.class);
-        bind(SendMessageHandler.class);
-        bind(ReplyMessageHandler.class);
-        bind(ForwardMessageHandler.class);
-
-        bindHandler(Contacts.class, ContactsHandler.class);
-        bindHandler(SendMessage.class, SendMessageHandler.class);
-
-        bind(UserPreferencesStorage.class).to(userPreferencesStorageClass);
-
-        bind(User.class).to(TestUser.class).in(Singleton.class);
-        bind(Properties.class).toInstance(properties);
-    }
-<<<<<<< HEAD
-
-}
->>>>>>> first commit
-=======
-  @Override
-  protected void configureHandlers() {
-      Properties properties = MockConstants.mockProperties;
-      ConfigurationProperties.validateProperties(properties);
-
-      Names.bindProperties(binder(), properties);
-      
-      bind(Session.class).toProvider(JavaMailSessionProvider.class);
-      bind(HttpSession.class).toProvider(MockHttpSessionProvider.class);
-      bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class);
-      bind(Log.class).toProvider(MockLogProvider.class).in(Singleton.class);
-
-      bind(IMAPStore.class).to(MockIMAPStore.class);
-      bind(IMAPStoreCache.class).to(DemoIMAPStoreCache.class).in(Singleton.class);
-
-      bind(LoginUserHandler.class);
-      bind(LogoutUserHandler.class);
-      bind(IdleHandler.class);
-      
-      bind(FetchFoldersHandler.class);
-      bind(CreateFolderHandler.class);
-      bind(DeleteFolderHandler.class);
-      bind(FetchMessagesHandler.class);
-      bind(DeleteMessageByUidHandler.class);
-      bind(GetMessageDetailsHandler.class);
-      bind(AbstractSendMessageHandler.class).to(SendMessageHandler.class);
-      bind(SendMessageHandler.class);
-      bind(ReplyMessageHandler.class);
-      bind(ForwardMessageHandler.class);
-      
-      bindHandler(Contacts.class, ContactsHandler.class);
-      bindHandler(SendMessage.class, SendMessageHandler.class);
-      
-      bind(UserPreferencesStorage.class).to(InSessionUserPreferencesStorage.class);
-      
-      bind(User.class).to(TestUser.class).in(Singleton.class);
-      bind(Properties.class).toInstance(properties);
-
-  }
-=======
->>>>>>> constantly changed by manolo
-
-}
->>>>>>> first commit
-=======
->>>>>>> re-add server unit tests

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java Mon Sep 23 07:04:08 2013
@@ -27,17 +27,7 @@ import java.util.Properties;
 import junit.framework.Assert;
 
 import org.apache.commons.io.FileUtils;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.server.ioc.GuiceListener;
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-import org.apache.hupa.server.ioc.GuiceListener;
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 import org.apache.hupa.server.mock.MockConstants;
 import org.apache.hupa.server.utils.ConfigurationProperties;
 import org.junit.Before;
@@ -47,19 +37,7 @@ public class ServerModulTest {
     private String tmpDir = System.getProperty("java.io.tmpdir");
 //    private GuiceServerModule module = new GuiceServerModule(tmpDir);
     
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    private String configDir = GuiceListener.CONFIG_DIR_IN_WAR;
-=======
-    private String configDir = GuiceServletConfig.CONFIG_DIR_IN_WAR;
->>>>>>> first commit
-=======
-    private String configDir = GuiceServletConfig.CONFIG_DIR_IN_WAR;
->>>>>>> first commit
-=======
     private String configDir = GuiceListener.CONFIG_DIR_IN_WAR;
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
     
 
     @Before
@@ -84,19 +62,7 @@ public class ServerModulTest {
 
     @Test
     public void testLoadPropertiesWithEmptyFile() throws Exception {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
         GuiceListener sconfig = new GuiceListener();
-=======
-        GuiceServletConfig sconfig = new GuiceServletConfig();
->>>>>>> first commit
-=======
-        GuiceServletConfig sconfig = new GuiceServletConfig();
->>>>>>> first commit
-=======
-        GuiceListener sconfig = new GuiceListener();
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
         
         File tmp = File.createTempFile("foo", ".properties");
         tmp.deleteOnExit();
@@ -109,19 +75,7 @@ public class ServerModulTest {
             Assert.fail("IllegalArgumentException must be thrown because of missing mandatory configuration properties");
         }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        System.setProperty(GuiceListener.SYS_PROP_CONFIG_FILE, tmp.toString());
-=======
-        System.setProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE, tmp.toString());
->>>>>>> first commit
-=======
-        System.setProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE, tmp.toString());
->>>>>>> first commit
-=======
         System.setProperty(GuiceListener.SYS_PROP_CONFIG_FILE, tmp.toString());
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
         try {
             sconfig.loadProperties();
         } catch (IllegalArgumentException e) {
@@ -129,19 +83,7 @@ public class ServerModulTest {
         } catch (Exception e) {
             Assert.fail("IllegalArgumentException must be thrown because of missing mandatory configuration properties");
         }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
         System.clearProperty(GuiceListener.SYS_PROP_CONFIG_FILE);
-=======
-        System.clearProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE);
->>>>>>> first commit
-=======
-        System.clearProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE);
->>>>>>> first commit
-=======
-        System.clearProperty(GuiceListener.SYS_PROP_CONFIG_FILE);
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
     }
 
     @Test
@@ -155,40 +97,13 @@ public class ServerModulTest {
         }
         FileUtils.writeLines(tmp, lines);
         
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        System.setProperty(GuiceListener.SYS_PROP_CONFIG_FILE, tmp.getAbsolutePath());
-        p = new GuiceListener().loadProperties();
-=======
-        System.setProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE, tmp.getAbsolutePath());
-        p = new GuiceServletConfig().loadProperties();
->>>>>>> first commit
-=======
-        System.setProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE, tmp.getAbsolutePath());
-        p = new GuiceServletConfig().loadProperties();
->>>>>>> first commit
-=======
         System.setProperty(GuiceListener.SYS_PROP_CONFIG_FILE, tmp.getAbsolutePath());
         p = new GuiceListener().loadProperties();
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
         Assert.assertNotNull(p);
         Assert.assertEquals(MockConstants.mockSettings.getInboxFolderName(), p.get("DefaultInboxFolder"));
         Assert.assertEquals(MockConstants.mockSettings.getTrashFolderName(), p.get("DefaultTrashFolder"));
         Assert.assertEquals(MockConstants.mockSettings.getSentFolderName(), p.get("DefaultSentFolder"));
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        System.clearProperty(GuiceListener.SYS_PROP_CONFIG_FILE);
-=======
-        System.clearProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE);
->>>>>>> first commit
-=======
-        System.clearProperty(GuiceServletConfig.SYS_PROP_CONFIG_FILE);
->>>>>>> first commit
-=======
         System.clearProperty(GuiceListener.SYS_PROP_CONFIG_FILE);
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
     }
 
 }

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java Mon Sep 23 07:04:08 2013
@@ -33,21 +33,8 @@ import org.apache.hupa.server.InMemoryIM
 import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
 import org.apache.hupa.server.mock.MockIMAPStore;
 import org.apache.hupa.server.mock.MockLog;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.data.UserImpl;
 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.data.UserImpl;
-import org.apache.hupa.shared.domain.User;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -70,24 +57,7 @@ public class StoreBugTest {
     Session session = Session.getDefaultInstance(new Properties(), null);
     static InMemoryIMAPStoreCache cache = new InMemoryIMAPStoreCache(new MockLog(), imapServer, imapPort, isSSl, 2, 60000, false,
         truststore, truststorePassword, new JavaMailSessionProvider().get());
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    static User user = new UserImpl() {
-=======
-    static User user = new User() {
-       private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
-    static User user = new User() {
-=======
     static User user = new UserImpl() {
-<<<<<<< HEAD
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-       private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
->>>>>>> remove warnings
        {setName(imapUser); setPassword(imapPass);}
     };
     

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java Mon Sep 23 07:04:08 2013
@@ -40,15 +40,7 @@ public class FetchFolderServiceTest exte
 	@Test public void invalidSessionId() {
 		httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
 		try {
-<<<<<<< HEAD
-<<<<<<< HEAD
 			fetchFoldersService.fetch(new ImapFolderImpl(), false);
-=======
-			fetchFoldersService.fetch(new ImapFolderImpl());
->>>>>>> re-add server unit tests
-=======
-			fetchFoldersService.fetch(new ImapFolderImpl(), false);
->>>>>>> pull all folders for label settings
 			fail("Invalid session");
 		} catch (InvalidSessionException e) {
 		} catch (Exception e) {
@@ -60,15 +52,7 @@ public class FetchFolderServiceTest exte
 	@Test public void noFolders() {
 		httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
 		try {
-<<<<<<< HEAD
-<<<<<<< HEAD
-			List<ImapFolder> folders = fetchFoldersService.fetch(null, false);
-=======
-			List<ImapFolder> folders = fetchFoldersService.fetch(null);
->>>>>>> re-add server unit tests
-=======
 			List<ImapFolder> folders = fetchFoldersService.fetch(null, false);
->>>>>>> pull all folders for label settings
 			assertTrue(folders.isEmpty());
 		} catch (Exception e) {
 			e.printStackTrace();

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java Mon Sep 23 07:04:08 2013
@@ -79,15 +79,7 @@ public class GetMessageDetailServiceTest
         res = getMessageDetailsService.filterHtmlDocument(msg, "aFolder", 9999l);
         assertNotSame(msg, res);
         assertEquals("...\n...<img   \n   src='" + 
-<<<<<<< HEAD
-<<<<<<< HEAD
                 SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" 
-=======
-                SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?" 
->>>>>>> re-add server unit tests
-=======
-                SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" 
->>>>>>> Fix tests
                 + SConsts.PARAM_FOLDER + "=aFolder&" 
                 + SConsts.PARAM_UID + "=9999&"
                 + SConsts.PARAM_NAME + "=1.1934304663@web28309.mail.ukl.yahoo.com' name='cid:1.1934304663@web28309.mail.ukl.yahoo.com' width=200\n....", res);
@@ -201,15 +193,7 @@ public class GetMessageDetailServiceTest
         
         // inline images have to be downloaded from the server
         assertTrue(details.getText().contains("img src=\'" + 
-<<<<<<< HEAD
-<<<<<<< HEAD
-                SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" +
-=======
-                SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?" +
->>>>>>> re-add server unit tests
-=======
                 SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" +
->>>>>>> Fix tests
                 SConsts.PARAM_FOLDER + "=WHATEVER&" + 
                 SConsts.PARAM_UID + "=0&" + 
                 SConsts.PARAM_NAME + "=1.1934304663@web28309.mail.ukl.yahoo.com'"));

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java Mon Sep 23 07:04:08 2013
@@ -18,11 +18,6 @@
  ****************************************************************/
 package org.apache.hupa.server.utils;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -38,52 +33,12 @@ import org.junit.Test;
 public class MessageUtilsTest extends HupaGuiceTestCase {
     
     @Test public void extractMessageAttachments() throws Exception {
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-import org.apache.hupa.server.HupaGuiceTestCase;
-
-import java.util.List;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-import javax.mail.Address;
-=======
->>>>>>> first commit
-=======
-import javax.mail.Address;
->>>>>>> constantly changed by manolo
-import javax.mail.BodyPart;
-import javax.mail.Message;
-
-public class MessageUtilsTest extends HupaGuiceTestCase {
-    
-    public void testExtractMessageAttachments() throws Exception {
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> re-add server unit tests
         Message message = TestUtils.createMockMimeMessage(session, 2);
         List<BodyPart> parts = MessageUtils.extractMessageAttachments(logger, message.getContent());
         assertEquals(2, parts.size());
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    @Test public void extractInlineAttachments() throws Exception {
-=======
-    public void testExtractInlineAttachments() throws Exception {
->>>>>>> first commit
-=======
-    public void testExtractInlineAttachments() throws Exception {
->>>>>>> first commit
-=======
     @Test public void extractInlineAttachments() throws Exception {
->>>>>>> re-add server unit tests
         Message message = TestUtils.createMockMimeMessage(session, 1);
         
         List<BodyPart> attachments = MessageUtils.extractMessageAttachments(logger, message.getContent());
@@ -105,25 +60,8 @@ public class MessageUtilsTest extends Hu
         assertEquals(3, attachments.size());
         assertEquals(1, inlineImgs.size());
     }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-    @Test public void getRecipients () throws Exception  {
-=======
-    
-    public void testGetRecipients () throws Exception  {
->>>>>>> constantly changed by manolo
-=======
-    
-    public void testGetRecipients () throws Exception  {
->>>>>>> constantly changed by manolo
-=======
     
     @Test public void getRecipients () throws Exception  {
->>>>>>> re-add server unit tests
         String encodedEmail = "=?ISO-8859-1?Q?Manolo_Pe=F1a?= <hello@hupa.org>";
         String decodedEmail = MessageUtils.decodeText(encodedEmail);
         assertFalse(encodedEmail.equals(decodedEmail));
@@ -131,17 +69,4 @@ public class MessageUtilsTest extends Hu
         Address[] addr = MessageUtils.getRecipients(encodedEmail, decodedEmail);
         assertEquals(addr[0].toString(), addr[1].toString());
     }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> re-add server unit tests
 }
\ No newline at end of file

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java Mon Sep 23 07:04:08 2013
@@ -42,41 +42,12 @@ import org.apache.commons.fileupload.Fil
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.hupa.server.FileItemRegistry;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 import org.apache.hupa.server.mock.MockIMAPFolder;
 import org.apache.hupa.server.service.SendMessageBaseServiceImpl;
 import org.apache.hupa.shared.data.MessageAttachmentImpl;
 import org.apache.hupa.shared.data.SmtpMessageImpl;
 import org.apache.hupa.shared.domain.MessageAttachment;
 import org.apache.hupa.shared.domain.SmtpMessage;
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-import org.apache.hupa.server.handler.AbstractSendMessageHandler;
-import org.apache.hupa.server.mock.MockIMAPFolder;
-import org.apache.hupa.shared.data.MessageAttachmentImpl;
-<<<<<<< HEAD
-import org.apache.hupa.shared.data.SMTPMessage;
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.domain.MessageAttachment;
->>>>>>> try to get message details, problem is:
-=======
-import org.apache.hupa.shared.data.SmtpMessageImpl;
-import org.apache.hupa.shared.domain.MessageAttachment;
-import org.apache.hupa.shared.domain.SmtpMessage;
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPStore;
 
@@ -188,19 +159,7 @@ public class TestUtils extends TestCase 
         message.setRecipients(RecipientType.CC, MessageUtils.getRecipients("cc@dom.com"));
         message.setRecipients(RecipientType.BCC, MessageUtils.getRecipients("bcc@dom.com"));
         message.setSubject("Subject");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        return SendMessageBaseServiceImpl.composeMessage(message, text, html, items);
-=======
-        return AbstractSendMessageHandler.composeMessage(message, text, html, items);
->>>>>>> first commit
-=======
-        return AbstractSendMessageHandler.composeMessage(message, text, html, items);
->>>>>>> first commit
-=======
         return SendMessageBaseServiceImpl.composeMessage(message, text, html, items);
->>>>>>> re-add server unit tests
     }
     
     public static Message createMockMimeMessage(Session session, int nfiles) throws MessagingException, IOException {
@@ -218,23 +177,7 @@ public class TestUtils extends TestCase 
      * @throws MessagingException
      * @throws IOException
      */
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     public static SmtpMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
-=======
-    public static SMTPMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
->>>>>>> first commit
-=======
-    public static SMTPMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
->>>>>>> first commit
-=======
-    public static SmtpMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
->>>>>>> forward and reply message to use RF
-=======
-    public static SmtpMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
->>>>>>> re-add server unit tests
         ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
 
         for (int i = 1; i <= nfiles; i++) {
@@ -242,23 +185,7 @@ public class TestUtils extends TestCase 
             fileItem = TestUtils.createMockFileItem("uploadedFile_" + i + ".bin");
             registry.add(fileItem);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-            MessageAttachment msgAttach = new MessageAttachmentImpl();
-=======
-            MessageAttachment msgAttach = new MessageAttachment();
->>>>>>> first commit
-=======
-            MessageAttachment msgAttach = new MessageAttachment();
->>>>>>> first commit
-=======
             MessageAttachment msgAttach = new MessageAttachmentImpl();
->>>>>>> try to get message details, problem is:
-=======
-            MessageAttachment msgAttach = new MessageAttachmentImpl();
->>>>>>> re-add server unit tests
             msgAttach.setName(fileItem.getFieldName());
             msgAttach.setContentType(fileItem.getContentType());
             msgAttach.setSize((int) fileItem.getSize());
@@ -266,23 +193,7 @@ public class TestUtils extends TestCase 
             attachments.add(msgAttach);
         }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        SmtpMessage smtpMessage = new SmtpMessageImpl();
-=======
-        SMTPMessage smtpMessage = new SMTPMessage();
->>>>>>> first commit
-=======
-        SMTPMessage smtpMessage = new SMTPMessage();
->>>>>>> first commit
-=======
-        SmtpMessage smtpMessage = new SmtpMessageImpl();
->>>>>>> forward and reply message to use RF
-=======
         SmtpMessage smtpMessage = new SmtpMessageImpl();
->>>>>>> re-add server unit tests
         smtpMessage.setFrom("Test user <from@dom.com>");
         smtpMessage.setTo(new ArrayList<String>(Arrays.asList("to@dom.com")));
         smtpMessage.setCc(new ArrayList<String>(Arrays.asList("cc@dom.com")));

Modified: james/hupa/trunk/shared/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/pom.xml (original)
+++ james/hupa/trunk/shared/pom.xml Mon Sep 23 07:04:08 2013
@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
@@ -43,22 +35,6 @@
             <artifactId>gwt-user</artifactId>
         </dependency>
         <dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> constantly changed by manolo
-            <groupId>net.customware.gwt.dispatch</groupId>
-            <artifactId>gwt-dispatch</artifactId>
-        </dependency>
-        <dependency>
-<<<<<<< HEAD
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -79,81 +55,4 @@
             </plugin>
         </plugins>
     </build>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.hupa</groupId>
-        <artifactId>hupa-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>hupa-shared</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache James Hupa Shared</name>
-    <description>Shared code for the client and server</description>
-    <dependencies>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.customware.gwt.dispatch</groupId>
-            <artifactId>gwt-dispatch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>gwt-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
 </project>

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml Mon Sep 23 07:04:08 2013
@@ -16,17 +16,6 @@
 -->
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd">
 <module>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  <inherits name='net.customware.gwt.dispatch.Dispatch' />
->>>>>>> first commit
-=======
-  <inherits name='net.customware.gwt.dispatch.Dispatch' />
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
   <inherits name='com.google.gwt.user.User'/>
   <source path="shared"/>
 </module>

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java Mon Sep 23 07:04:08 2013
@@ -21,17 +21,6 @@ package org.apache.hupa.shared;
 
 public class SConsts {
     public static final String HUPA = "hupa/";
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    public static final String SERVLET_DISPATCH = "dispatch";
->>>>>>> first commit
-=======
-    public static final String SERVLET_DISPATCH = "dispatch";
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
     public static final String SERVLET_DOWNLOAD = "downloadAttachmentServlet";
     public static final String SERVLET_UPLOAD = "uploadAttachmentServlet";
     public static final String SERVLET_SOURCE = "messageSourceServlet";
@@ -40,9 +29,6 @@ public class SConsts {
     public static final String PARAM_NAME = "name";
     public static final String PARAM_FOLDER = "folder";
     public static final String PARAM_UID = "uid";
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     public static final String PARAM_MODE = "mode";
     
     public static final String USER_SESS_ATTR = "user";
@@ -53,26 +39,4 @@ public class SConsts {
     public static final String HEADER_MESSAGE_ID = "Message-ID";
     public static final String HEADER_REFERENCES_SEPARATOR = "\r\n ";
     
-=======
-    
-    public static final String USER_SESS_ATTR = "user";
-    public static final String CONTACTS_SESS_ATTR = "contacts";
->>>>>>> first commit
-=======
-=======
-    public static final String PARAM_MODE = "mode";
->>>>>>> merged with main trunk in apache: replacing rounded borders with gwt decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
-    
-    public static final String USER_SESS_ATTR = "user";
-    public static final String CONTACTS_SESS_ATTR = "contacts";
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-    
-    public static final String HEADER_IN_REPLY_TO = "In-Reply-To";
-    public static final String HEADER_REFERENCES = "References";
-    public static final String HEADER_MESSAGE_ID = "Message-ID";
-    public static final String HEADER_REFERENCES_SEPARATOR = "\r\n ";
-    
->>>>>>> Fixes HUPA-96 : pass reference ids when replying. Patch by Zsombor Gegesy
 }
\ No newline at end of file

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.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
-=======
->>>>>>> Succeed creating new folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.shared.data;
 
 import org.apache.hupa.shared.domain.CreateFolderAction;

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=1525515&r1=1525514&r2=1525515&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 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.shared.data;
 
 import org.apache.hupa.shared.domain.DeleteFolderAction;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.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.shared.data;
 
 import org.apache.hupa.shared.domain.DeleteMessageAction;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.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.shared.data;
 
 import org.apache.hupa.shared.domain.DeleteMessageAllAction;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.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.shared.data;
 
 import java.util.List;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.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.shared.data;
 
 import org.apache.hupa.shared.domain.DeleteMessageResult;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.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.shared.data;
 
 import org.apache.hupa.shared.domain.ImapFolder;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.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.shared.data;
 
 import java.util.List;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.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
-=======
->>>>>>> Succeed creating new folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.shared.data;
 
 import org.apache.hupa.shared.domain.GenericResult;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.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.shared.data;
 
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.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.shared.data;
 
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawActionImpl.java 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,22 +17,10 @@
  * 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.shared.data;
 
 import org.apache.hupa.shared.domain.GetMessageRawAction;
 import org.apache.hupa.shared.domain.ImapFolder;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.shared.rpc.RawMessage;
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 
 public class GetMessageRawActionImpl implements GetMessageRawAction {
 
@@ -60,18 +44,8 @@ public class GetMessageRawActionImpl imp
     }
     
     public boolean equals(Object obj) {
-<<<<<<< HEAD
-<<<<<<< HEAD
         if (obj instanceof GetMessageRawAction) {
             GetMessageRawAction action = (GetMessageRawAction) obj;
-=======
-        if (obj instanceof RawMessage) {
-            RawMessage action = (RawMessage) obj;
->>>>>>> other RFs
-=======
-        if (obj instanceof GetMessageRawAction) {
-            GetMessageRawAction action = (GetMessageRawAction) obj;
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
             if (action.getFolder().equals(getFolder()) && action.getUid() == getUid()) {
                 return true;
             }

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageRawResultImpl.java 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.shared.data;
 
 import org.apache.hupa.shared.domain.GetMessageRawResult;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleActionImpl.java 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.shared.data;
 
 import org.apache.hupa.shared.domain.IdleAction;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IdleResultImpl.java 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.shared.data;
 
 import org.apache.hupa.shared.domain.IdleResult;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java Mon Sep 23 07:04:08 2013
@@ -20,139 +20,14 @@
 package org.apache.hupa.shared.data;
 
 import java.util.ArrayList;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.util.List;
 
-<<<<<<< HEAD
-<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
-import org.apache.hupa.shared.rf.EntityBase;
-=======
->>>>>>> first commit
-=======
-import java.util.List;
-
-<<<<<<< HEAD
-import javax.servlet.http.HttpSession;
-
-import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-=======
-import org.apache.hupa.shared.rf.EntityBase;
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
-import org.apache.hupa.shared.proxy.ImapFolder;
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
-=======
 import org.apache.hupa.shared.domain.ImapFolder;
 
-<<<<<<< HEAD
->>>>>>> Allow client can use the domain entity interface.
-
-/**
- * IMAPFolder
- * 
- */
-<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class IMAPFolder extends EntityBase implements Serializable {
-	
-	private Long id;
-	private Long version;
-	
-
-    public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getVersion() {
-		return version;
-	}
-
-	public void setVersion(Long version) {
-		this.version = version;
-	}
-	
-	
-=======
-public class IMAPFolder implements Serializable {
->>>>>>> 
-
-	/**
-=======
-public class IMAPFolder implements Serializable {
-<<<<<<< HEAD
-
-    /**
->>>>>>> first commit
-=======
-=======
-public class IMAPFolder extends EntityBase implements Serializable {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-	
-	private Long id;
-	private Long version;
-	
-
-    public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getVersion() {
-		return version;
-	}
-
-	public void setVersion(Long version) {
-		this.version = version;
-	}
-	
-	
-=======
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
 public class ImapFolderImpl implements ImapFolder {
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
-
-<<<<<<< HEAD
-	/**
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-     * 
-     */
-    private static final long serialVersionUID = 2084188092060266479L;
 
-<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
-=======
-    private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
->>>>>>> first commit
-=======
-    private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
-    private List<IMAPFolder> children = new ArrayList<IMAPFolder>();
->>>>>>> 
-=======
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
     private List<ImapFolder> children = new ArrayList<ImapFolder>();
-<<<<<<< HEAD
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
-=======
     private String name;
->>>>>>> fix the frozen autobean issue, yet another occur
     private String fullName;
     private String delimiter;
     private int messageCount;
@@ -207,25 +82,8 @@ public class ImapFolderImpl implements I
      * 
      * @param children
      */
-<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public void setChildIMAPFolders(List<IMAPFolder> childs) {
-=======
-    public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
->>>>>>> first commit
-=======
-    public void setChildIMAPFolders(List<IMAPFolder> childs) {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        this.childs = childs;
-=======
-    public void setChildren(List<IMAPFolder> children) {
-=======
     public void setChildren(List<ImapFolder> children) {
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
         this.children = children;
->>>>>>> 
     }
 
     /**
@@ -233,25 +91,8 @@ public class ImapFolderImpl implements I
      * 
      * @return childs
      */
-<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public List<IMAPFolder> getChildIMAPFolders() {
-=======
-    public ArrayList<IMAPFolder> getChildIMAPFolders() {
->>>>>>> first commit
-=======
-    public List<IMAPFolder> getChildIMAPFolders() {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        return childs;
-=======
-    public List<IMAPFolder> getChildren() {
-=======
     public List<ImapFolder> getChildren() {
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
         return children;
->>>>>>> 
     }
 
     /**
@@ -344,25 +185,13 @@ public class ImapFolderImpl implements I
     public int hashCode() {
         return getFullName().hashCode();
     }
-<<<<<<< HEAD
-<<<<<<< HEAD
 
-=======
->>>>>>> first commit
-=======
-
-<<<<<<< HEAD
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
     // FIXME Could not locate setter for property name in type ImapFolderImpl
 	@Override
     public void setName(String name) {
 	    this.name = name;
     }
 
-<<<<<<< HEAD
->>>>>>> Succeed creating new folder
-=======
 	
 	@Override
     public void setFolderTo(ImapFolder folder) {
@@ -375,9 +204,6 @@ public class ImapFolderImpl implements I
 		folder.setUnseenMessageCount(this.unseenMessageCount);
     }
 
-<<<<<<< HEAD
->>>>>>> fix AllDelete feature in issue 11. and scrub some code
-=======
 	@Override
     public boolean getHasChildren() {
 	    return hasChildren;
@@ -388,6 +214,5 @@ public class ImapFolderImpl implements I
 		this.hasChildren = hasChildren;
 	}
 
->>>>>>> Fix issue #15.
     
 }

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserActionImpl.java 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.shared.data;
 
 import org.apache.hupa.shared.domain.LogoutUserAction;

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/LogoutUserResultImpl.java 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.shared.data;
 
 import org.apache.hupa.shared.domain.LogoutUserResult;



---------------------------------------------------------------------
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