You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 04:42:12 UTC
svn commit: r1522132 [3/4] - 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/gin/
client/src/main/java/org/apache/hupa/client/mvp/ client/sr...
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -39,10 +39,14 @@ import org.apache.hupa.server.IMAPStoreC
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.shared.SConsts;
<<<<<<< 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 com.google.inject.Inject;
import com.sun.mail.imap.IMAPFolder;
@@ -84,6 +88,7 @@ public class DownloadAttachmentServlet e
String attachmentName = request.getParameter(SConsts.PARAM_NAME);
String folderName = request.getParameter(SConsts.PARAM_FOLDER);
<<<<<<< HEAD
+<<<<<<< HEAD
String mode = request.getParameter(SConsts.PARAM_MODE);
boolean inline = "inline".equals(mode);
if (!inline) {
@@ -94,6 +99,10 @@ public class DownloadAttachmentServlet e
response.setHeader("Content-disposition", "attachment; filename="
+ attachmentName + "");
>>>>>>> first commit
+=======
+ response.setHeader("Content-disposition", "attachment; filename="
+ + attachmentName + "");
+>>>>>>> first commit
InputStream in = null;
OutputStream out = response.getOutputStream();
@@ -116,6 +125,7 @@ public class DownloadAttachmentServlet e
in = part.getInputStream();
if (in != null) {
<<<<<<< HEAD
+<<<<<<< HEAD
// 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) {
@@ -124,6 +134,9 @@ public class DownloadAttachmentServlet e
=======
response.setContentLength(part.getSize());
>>>>>>> first commit
+=======
+ response.setContentLength(part.getSize());
+>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -33,6 +33,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.User;
@@ -44,6 +45,11 @@ import org.apache.hupa.server.IMAPStoreC
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.shared.SConsts;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.inject.Inject;
import com.sun.mail.imap.IMAPFolder;
@@ -57,17 +63,21 @@ public class MessageSourceServlet extend
private static final long serialVersionUID = 1245563204035792963L;
<<<<<<< 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;
@@ -76,6 +86,8 @@ public class MessageSourceServlet extend
@Inject
public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
this.cache = cache;
this.logger = logger;
}
@@ -115,6 +127,7 @@ public class MessageSourceServlet extend
logger.error(msg, e);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
throw new ServletException(msg, e);
=======
throw new ServletException(msg);
@@ -122,6 +135,9 @@ public class MessageSourceServlet extend
=======
throw new ServletException(msg, e);
>>>>>>> constantly changed by manolo
+=======
+ throw new ServletException(msg);
+>>>>>>> first commit
} 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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -55,6 +55,7 @@ public enum ConfigurationProperties {
USERNAME("Username", false, null),
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
PASSWORD("Password", false, null);
=======
PASSWORD("Password", false, null),
@@ -63,6 +64,10 @@ public enum ConfigurationProperties {
=======
PASSWORD("Password", false, null);
>>>>>>> constantly changed by manolo
+=======
+ PASSWORD("Password", false, null),
+ SESSIONID("DefaultUserSessionId", false, null);
+>>>>>>> first commit
private String property;
private boolean mandatory;
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.server.utils;
<<<<<<< HEAD
+<<<<<<< HEAD
import java.io.File;
import java.io.IOException;
<<<<<<< HEAD
@@ -42,6 +43,12 @@ 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
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -58,6 +65,10 @@ import javax.mail.internet.MimeUtility;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.logging.Log;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+import org.apache.hupa.server.handler.AbstractSendMessageHandler;
+>>>>>>> first commit
=======
import org.apache.hupa.server.handler.AbstractSendMessageHandler;
>>>>>>> first commit
@@ -95,6 +106,7 @@ public class MessageUtils {
for (int i = 0; i < recipients.size(); i++) {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
array[i] = new InternetAddress(encodeEmail(recipients.get(i)));
=======
array[i] = new InternetAddress(recipients.get(i));
@@ -102,6 +114,9 @@ public class MessageUtils {
=======
array[i] = new InternetAddress(encodeEmail(recipients.get(i)));
>>>>>>> constantly changed by manolo
+=======
+ array[i] = new InternetAddress(recipients.get(i));
+>>>>>>> first commit
}
return array;
}
@@ -201,15 +216,20 @@ public class MessageUtils {
public static BodyPart fileitemToBodypart(FileItem item) throws MessagingException {
MimeBodyPart messageBodyPart = new MimeBodyPart();
<<<<<<< HEAD
+<<<<<<< HEAD
DataSource source = new FileItemDataStore(item);
=======
DataSource source = new AbstractSendMessageHandler.FileItemDataStore(item);
>>>>>>> first commit
+=======
+ DataSource source = new AbstractSendMessageHandler.FileItemDataStore(item);
+>>>>>>> first commit
messageBodyPart.setDataHandler(new DataHandler(source));
messageBodyPart.setFileName(source.getName());
return messageBodyPart;
}
<<<<<<< HEAD
+<<<<<<< HEAD
/**
* DataStore which wrap a FileItem
@@ -360,4 +380,7 @@ public class MessageUtils {
return ret;
}
>>>>>>> constantly changed by manolo
+=======
+
+>>>>>>> first commit
}
\ 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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -49,11 +49,15 @@ 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
+ "?" + SConsts.PARAM_MODE + "=inline"
+ "&" + SConsts.PARAM_FOLDER + "=%%FOLDER%%"
=======
+ "?" + SConsts.PARAM_FOLDER + "=%%FOLDER%%"
>>>>>>> first commit
+=======
+ + "?" + SConsts.PARAM_FOLDER + "=%%FOLDER%%"
+>>>>>>> first commit
+ "&" + SConsts.PARAM_UID + "=%%UID%%"
+ "&" + SConsts.PARAM_NAME + "=$2' name='cid:$2'";
@@ -105,7 +109,11 @@ public class RegexPatterns {
<<<<<<< HEAD
+<<<<<<< HEAD
+}
+=======
}
+>>>>>>> first commit
=======
}
>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -16,6 +16,7 @@
#############################################################################
<<<<<<< HEAD
+<<<<<<< HEAD
# The demo mode should make two lines different
# 1. IMAPServerAddress=hupa.demo
# 2. DefaultInboxFolder=Mock-Inbox
@@ -23,6 +24,8 @@
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
# 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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -112,6 +113,8 @@ public class HupaGuiceTestCase{
}
}
=======
+=======
+>>>>>>> first commit
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -228,4 +231,7 @@ public abstract class HupaGuiceTestCase
}
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.InMemoryIMAPStoreCache;
import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
@@ -36,6 +37,8 @@ import org.apache.hupa.server.ioc.demo.D
=======
import org.apache.hupa.server.InMemoryIMAPStoreCache;
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
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;
@@ -53,6 +56,9 @@ import org.apache.hupa.server.handler.Lo
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
import org.apache.hupa.server.mock.MockConstants;
import org.apache.hupa.server.mock.MockHttpSessionProvider;
@@ -61,6 +67,7 @@ import org.apache.hupa.server.mock.MockL
import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.service.CheckSessionServiceImpl;
import org.apache.hupa.server.service.CreateFolderServiceImpl;
import org.apache.hupa.server.service.DeleteFolderServiceImpl;
@@ -118,6 +125,8 @@ import org.apache.hupa.shared.domain.Use
import com.google.inject.Provider;
=======
+=======
+>>>>>>> first commit
import org.apache.hupa.server.utils.ConfigurationProperties;
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
@@ -125,15 +134,19 @@ import org.apache.hupa.shared.rpc.Contac
import org.apache.hupa.shared.rpc.SendMessage;
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> first commit
=======
import com.google.inject.Provider;
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
import com.google.inject.Singleton;
import com.google.inject.name.Names;
import com.sun.mail.imap.IMAPStore;
<<<<<<< HEAD
+<<<<<<< HEAD
public class GuiceServerTestModule extends AbstractGuiceTestModule {
protected Class<? extends UserPreferencesStorage> userPreferencesStorageClass = InSessionUserPreferencesStorage.class;
@@ -227,11 +240,14 @@ public class GuiceServerTestModule exten
}
=======
+=======
+>>>>>>> first commit
/**
* Guice module used in server tests.
*/
public class GuiceServerTestModule extends AbstractGuiceTestModule {
+<<<<<<< HEAD
protected Class<? extends UserPreferencesStorage> userPreferencesStorageClass = InSessionUserPreferencesStorage.class;
protected Class<? extends Provider<Log>> logProviderClass = MockLogProvider.class;
protected Properties properties = MockConstants.mockProperties;
@@ -283,3 +299,46 @@ public class GuiceServerTestModule exten
}
>>>>>>> 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);
+
+ }
+
+}
+>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -28,9 +28,12 @@ import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.ioc.GuiceListener;
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
import org.apache.hupa.server.mock.MockConstants;
import org.apache.hupa.server.utils.ConfigurationProperties;
import org.junit.Before;
@@ -41,10 +44,14 @@ public class ServerModulTest {
// private GuiceServerModule module = new GuiceServerModule(tmpDir);
<<<<<<< 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
@Before
@@ -70,10 +77,14 @@ public class ServerModulTest {
@Test
public void testLoadPropertiesWithEmptyFile() throws Exception {
<<<<<<< HEAD
+<<<<<<< HEAD
GuiceListener sconfig = new GuiceListener();
=======
GuiceServletConfig sconfig = new GuiceServletConfig();
>>>>>>> first commit
+=======
+ GuiceServletConfig sconfig = new GuiceServletConfig();
+>>>>>>> first commit
File tmp = File.createTempFile("foo", ".properties");
tmp.deleteOnExit();
@@ -87,10 +98,14 @@ public class ServerModulTest {
}
<<<<<<< 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
try {
sconfig.loadProperties();
} catch (IllegalArgumentException e) {
@@ -99,10 +114,14 @@ public class ServerModulTest {
Assert.fail("IllegalArgumentException must be thrown because of missing mandatory configuration properties");
}
<<<<<<< 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
}
@Test
@@ -117,21 +136,30 @@ public class ServerModulTest {
FileUtils.writeLines(tmp, lines);
<<<<<<< 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
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
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
}
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java Thu Sep 12 02:42:10 2013
@@ -23,6 +23,7 @@ import junit.framework.Assert;
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.shared.rpc.Contacts;
+<<<<<<< HEAD
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
public class ContactsHandlerTest extends HupaGuiceTestCase {
@@ -42,6 +43,16 @@ public class ContactsHandlerTest extends
userPreferences.addContact("\"somebody@foo.com\" <so...@foo.com>");
userPreferences.addContact("<so...@foo.com> <so...@foo.com>");
Assert.assertEquals(2, getContacts().length);
+=======
+
+public class ContactsHandlerTest extends HupaGuiceTestCase {
+
+ public void testContactsHandler() throws Exception {
+ Assert.assertEquals(0, contactsHandler.execute(new Contacts(), null).getContacts().length);
+ userPreferences.addContact("Somebody <so...@foo.com>");
+ userPreferences.addContact(" Some.body <so...@foo.com> ");
+ Assert.assertEquals(1, contactsHandler.execute(new Contacts(), null).getContacts().length);
+>>>>>>> first commit
}
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java Thu Sep 12 02:42:10 2013
@@ -40,11 +40,19 @@ public class FetchMessagesHandlerTest ex
MockIMAPFolder f = (MockIMAPFolder)store.getFolder("WHATEVER");
f.create(Folder.HOLDS_MESSAGES);
+<<<<<<< HEAD
ByteArrayInputStream is = new ByteArrayInputStream("From: \"a b c\"<aa...@foo.com>\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
MimeMessage m1 = new MimeMessage(session, is);
is = new ByteArrayInputStream("From: \"=?ISO-8859-1?Q?Manolo_Pe=F1a?=\" <pe...@foo.com>\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
MimeMessage m2 = new MimeMessage(session, is);
is = new ByteArrayInputStream("From: a@foo.com\nTo: \"<b...@foo.com>\" <b...@foo.com>\nSubject: =?ISO-8859-1?Q?Monta=F1a?=\n\ndata".getBytes());
+=======
+ ByteArrayInputStream is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
+ MimeMessage m1 = new MimeMessage(session, is);
+ is = new ByteArrayInputStream("From: =?ISO-8859-1?Q?Manolo_Pe=F1a?= <pe...@foo.com>\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
+ MimeMessage m2 = new MimeMessage(session, is);
+ is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: =?ISO-8859-1?Q?Monta=F1a?=\n\ndata".getBytes());
+>>>>>>> first commit
MimeMessage m3 = new MimeMessage(session, is);
ArrayList<org.apache.hupa.shared.data.Message> msgs = fetchMessagesHandler.convert(2, f, new Message[]{m1, m2, m3});
@@ -52,17 +60,23 @@ public class FetchMessagesHandlerTest ex
msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1, m2, m3});
assertEquals(3, msgs.size());
+<<<<<<< HEAD
msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1});
assertEquals("a b c <aa...@foo.com>", msgs.get(0).getFrom());
+=======
+>>>>>>> first commit
msgs = fetchMessagesHandler.convert(10, f, new Message[]{m2});
assertEquals("Manolo Pe\u00F1a <pe...@foo.com>", msgs.get(0).getFrom());
msgs = fetchMessagesHandler.convert(10, f, new Message[]{m3});
assertEquals("Monta\u00F1a", msgs.get(0).getSubject());
+<<<<<<< HEAD
assertEquals("b@foo.com <b...@foo.com>", msgs.get(0).getTo().get(0));
+=======
+>>>>>>> first commit
}
public void testFetchMessages() throws Exception {
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java Thu Sep 12 02:42:10 2013
@@ -18,28 +18,44 @@
****************************************************************/
package org.apache.hupa.server.handler;
+<<<<<<< HEAD
import java.io.ByteArrayInputStream;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
+=======
+import com.google.inject.Module;
+
+import com.sun.mail.imap.IMAPStore;
+>>>>>>> first commit
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.guice.GuiceServerTestModule;
+<<<<<<< HEAD
import org.apache.hupa.server.guice.providers.LogProvider;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
+<<<<<<< HEAD
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
import com.google.inject.Module;
import com.sun.mail.imap.IMAPStore;
+=======
+
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+>>>>>>> first commit
public class HandlersTest extends HupaGuiceTestCase {
@@ -53,7 +69,11 @@ public class HandlersTest extends HupaGu
public MyModule() {
// properties = courierProperties;
// properties = gmailProperties;
+<<<<<<< HEAD
// logProviderClass = LogProvider.class;
+=======
+ // logClass = LogProvider.class;
+>>>>>>> first commit
}
}
@@ -62,6 +82,7 @@ public class HandlersTest extends HupaGu
return new Module[]{new MyModule()};
}
+<<<<<<< HEAD
public void testLoginAndFetchFolders() throws Exception {
org.apache.hupa.shared.rpc.LoginUser l = new org.apache.hupa.shared.rpc.LoginUser(testUser.getName(),testUser.getPassword());
loginUser.execute(l, null);
@@ -92,6 +113,18 @@ public class HandlersTest extends HupaGu
result = fetchMessagesHandler.execute(new FetchMessages(sFolder, 0, 100, ""), null);
assertEquals(1, result.getMessages().size() - nmsgs);
+=======
+ public void testLoginAndFetchFolders() {
+ try {
+ org.apache.hupa.shared.rpc.LoginUser l = new org.apache.hupa.shared.rpc.LoginUser(testUser.getName(),testUser.getPassword());
+ loginUser.execute(l, null);
+ FetchFoldersResult result = fetchFoldersHandler.execute(new FetchFolders(), null);
+ assertNotNull(result);
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail("Shouldn't throw an exception");
+ }
+>>>>>>> first commit
}
public void testCreateAndDeleteFolder() throws MessagingException {
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -34,11 +34,15 @@ import org.apache.hupa.server.guice.prov
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.server.mock.MockLog;
<<<<<<< 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.junit.Ignore;
import org.junit.Test;
@@ -62,11 +66,16 @@ public class StoreBugTest {
static InMemoryIMAPStoreCache cache = new InMemoryIMAPStoreCache(new MockLog(), imapServer, imapPort, isSSl, 2, 60000, false,
truststore, truststorePassword, new JavaMailSessionProvider().get());
<<<<<<< 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() {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
{setName(imapUser); setPassword(imapPass);}
};
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java Thu Sep 12 02:42:10 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.server.preferenc
import java.util.ArrayList;
import java.util.Arrays;
+<<<<<<< HEAD
import javax.mail.Flags;
import javax.mail.Folder;
@@ -28,15 +29,61 @@ import javax.mail.Folder;
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.guice.GuiceServerTestModule;
import org.apache.hupa.server.guice.providers.LogProvider;
+=======
+import java.util.Properties;
+
+import javax.mail.Flags;
+import javax.mail.Folder;
+import javax.mail.Session;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.server.guice.GuiceServerTestModule;
+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;
+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;
+import org.apache.hupa.server.utils.ConfigurationProperties;
+>>>>>>> first commit
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.SMTPMessage;
+<<<<<<< HEAD
+=======
+import org.apache.hupa.shared.data.Settings;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.rpc.Contacts;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
import org.apache.hupa.shared.rpc.SendMessage;
import com.google.inject.Module;
+<<<<<<< HEAD
+=======
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+>>>>>>> first commit
import com.sun.mail.imap.IMAPStore;
public class InImapUserPreferencesStorageTest extends HupaGuiceTestCase {
@@ -48,13 +95,19 @@ public class InImapUserPreferencesStorag
- Be sure the user and password are set correctly
- Comment the delay
*/
+<<<<<<< HEAD
static class InImapUserPreferencesGuiceModule extends GuiceServerTestModule {
public InImapUserPreferencesGuiceModule() {
+=======
+ static class MyModule extends GuiceServerTestModule {
+ public MyModule() {
+>>>>>>> first commit
// Select a valid imap provider, comment all to use Mock
// properties = courierProperties;
// properties = gmailProperties;
// properties = jamesProperties;
+<<<<<<< HEAD
// Uncomment to use production logger
logProviderClass = LogProvider.class;
@@ -65,11 +118,61 @@ public class InImapUserPreferencesStorag
InImapUserPreferencesStorage.IMAP_SAVE_DELAY = 400;
}
+=======
+
+ // Uncomment to use production logger
+ // logClass = LogProvider.class;
+
+ // Change the default delay to run test faster
+ InImapUserPreferencesStorage.IMAP_SAVE_DELAY = 400;
+ }
+
+ @Override
+ protected void configureHandlers() {
+ Properties p = MockConstants.mockProperties;
+ ConfigurationProperties.validateProperties(p);
+ Names.bindProperties(binder(), p);
+
+ 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(InImapUserPreferencesStorage.class);
+
+ bind(User.class).to(TestUser.class).in(Singleton.class);
+ }
+>>>>>>> first commit
}
@Override
protected Module[] getModules() {
+<<<<<<< HEAD
return new Module[]{new InImapUserPreferencesGuiceModule()};
+=======
+ return new Module[]{new MyModule()};
+>>>>>>> first commit
}
/**
@@ -170,6 +273,7 @@ public class InImapUserPreferencesStorag
smtpmsg.setCc(new ArrayList<String>());
smtpmsg.setBcc(new ArrayList<String>());
SendMessage action = new SendMessage(smtpmsg);
+<<<<<<< HEAD
String folderName = testUser.getSettings().getDraftsFolderName();
@@ -183,6 +287,20 @@ public class InImapUserPreferencesStorag
assertEquals(1, userPreferences.getContacts().length);
// The imap is saved asynchronously after a delay, so the folder exists after a while
+=======
+ sendMessageHandler.execute(action, null);
+
+ // The email has to be added to the contact list
+ assertEquals(1, userPreferences.getContacts().length);
+
+ // The imap is saved asynchronously after a delay, so the folder exists after a while
+ String folderName = testUser.getSettings().getDraftsFolderName();
+ Folder folder = store.getFolder(folderName);
+ folder = store.getFolder(folderName);
+ if (folder.exists())
+ assertTrue(folder.getMessageCount() == 0);
+
+>>>>>>> first commit
Thread.sleep(InImapUserPreferencesStorage.IMAP_SAVE_DELAY + 500);
folder = store.getFolder(folderName);
assertNotNull(folder);
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.server.utils;
<<<<<<< HEAD
+<<<<<<< HEAD
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -35,17 +36,25 @@ public class MessageUtilsTest extends Hu
@Test public void extractMessageAttachments() throws Exception {
=======
+=======
+>>>>>>> first commit
import org.apache.hupa.server.HupaGuiceTestCase;
import java.util.List;
+<<<<<<< HEAD
import javax.mail.Address;
+=======
+>>>>>>> first commit
import javax.mail.BodyPart;
import javax.mail.Message;
public class MessageUtilsTest extends HupaGuiceTestCase {
public void testExtractMessageAttachments() throws Exception {
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
Message message = TestUtils.createMockMimeMessage(session, 2);
List<BodyPart> parts = MessageUtils.extractMessageAttachments(logger, message.getContent());
@@ -53,10 +62,14 @@ public class MessageUtilsTest extends Hu
}
<<<<<<< HEAD
+<<<<<<< HEAD
@Test public void extractInlineAttachments() throws Exception {
=======
public void testExtractInlineAttachments() throws Exception {
>>>>>>> first commit
+=======
+ public void testExtractInlineAttachments() throws Exception {
+>>>>>>> first commit
Message message = TestUtils.createMockMimeMessage(session, 1);
List<BodyPart> attachments = MessageUtils.extractMessageAttachments(logger, message.getContent());
@@ -80,6 +93,7 @@ public class MessageUtilsTest extends Hu
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Test public void getRecipients () throws Exception {
=======
@@ -98,4 +112,6 @@ public class MessageUtilsTest extends Hu
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
}
\ 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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -43,6 +43,7 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.hupa.server.FileItemRegistry;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.service.SendMessageBaseServiceImpl;
import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -50,10 +51,15 @@ import org.apache.hupa.shared.data.SmtpM
import org.apache.hupa.shared.domain.MessageAttachment;
import org.apache.hupa.shared.domain.SmtpMessage;
=======
+=======
+>>>>>>> first commit
import org.apache.hupa.server.handler.AbstractSendMessageHandler;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.SMTPMessage;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
import com.sun.mail.imap.IMAPStore;
@@ -167,10 +173,14 @@ public class TestUtils extends TestCase
message.setRecipients(RecipientType.BCC, MessageUtils.getRecipients("bcc@dom.com"));
message.setSubject("Subject");
<<<<<<< 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
}
public static Message createMockMimeMessage(Session session, int nfiles) throws MessagingException, IOException {
@@ -189,10 +199,14 @@ public class TestUtils extends TestCase
* @throws IOException
*/
<<<<<<< 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
ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
for (int i = 1; i <= nfiles; i++) {
@@ -201,10 +215,14 @@ public class TestUtils extends TestCase
registry.add(fileItem);
<<<<<<< HEAD
+<<<<<<< HEAD
MessageAttachment msgAttach = new MessageAttachmentImpl();
=======
MessageAttachment msgAttach = new MessageAttachment();
>>>>>>> first commit
+=======
+ MessageAttachment msgAttach = new MessageAttachment();
+>>>>>>> first commit
msgAttach.setName(fileItem.getFieldName());
msgAttach.setContentType(fileItem.getContentType());
msgAttach.setSize((int) fileItem.getSize());
@@ -213,10 +231,14 @@ public class TestUtils extends TestCase
}
<<<<<<< HEAD
+<<<<<<< HEAD
SmtpMessage smtpMessage = new SmtpMessageImpl();
=======
SMTPMessage smtpMessage = new SMTPMessage();
>>>>>>> first commit
+=======
+ SMTPMessage smtpMessage = new SMTPMessage();
+>>>>>>> first commit
smtpMessage.setFrom("Test user <fr...@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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/pom.xml (original)
+++ james/hupa/trunk/shared/pom.xml Thu Sep 12 02:42:10 2013
@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> constantly changed by manolo
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -68,6 +69,8 @@
</build>
<<<<<<< HEAD
=======
+=======
+>>>>>>> first commit
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -132,7 +135,10 @@
</plugin>
</plugins>
</build>
+<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
</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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -17,6 +17,10 @@
<!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
+=======
+ <inherits name='net.customware.gwt.dispatch.Dispatch' />
+>>>>>>> first commit
=======
<inherits name='net.customware.gwt.dispatch.Dispatch' />
>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -22,6 +22,10 @@ package org.apache.hupa.shared;
public class SConsts {
public static final String HUPA = "hupa/";
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ public static final String SERVLET_DISPATCH = "dispatch";
+>>>>>>> first commit
=======
public static final String SERVLET_DISPATCH = "dispatch";
>>>>>>> first commit
@@ -34,6 +38,7 @@ public class SConsts {
public static final String PARAM_FOLDER = "folder";
public static final String PARAM_UID = "uid";
<<<<<<< HEAD
+<<<<<<< HEAD
public static final String PARAM_MODE = "mode";
public static final String USER_SESS_ATTR = "user";
@@ -49,4 +54,9 @@ public class SConsts {
public static final String USER_SESS_ATTR = "user";
public static final String CONTACTS_SESS_ATTR = "contacts";
>>>>>>> first commit
+=======
+
+ public static final String USER_SESS_ATTR = "user";
+ public static final String CONTACTS_SESS_ATTR = "contacts";
+>>>>>>> first commit
}
\ No newline at end of file
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java Thu Sep 12 02:42:10 2013
@@ -21,14 +21,18 @@ package org.apache.hupa.shared.data;
import java.io.Serializable;
import java.util.ArrayList;
+<<<<<<< HEAD
import java.util.List;
import org.apache.hupa.shared.rf.EntityBase;
+=======
+>>>>>>> first commit
/**
* IMAPFolder
*
*/
+<<<<<<< HEAD
public class IMAPFolder extends EntityBase implements Serializable {
private Long id;
@@ -54,11 +58,20 @@ public class IMAPFolder extends EntityBa
/**
+=======
+public class IMAPFolder implements Serializable {
+
+ /**
+>>>>>>> first commit
*
*/
private static final long serialVersionUID = 2084188092060266479L;
+<<<<<<< HEAD
private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
+=======
+ private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
+>>>>>>> first commit
private String fullName;
private String delimiter;
private int msgCount;
@@ -101,7 +114,11 @@ public class IMAPFolder extends EntityBa
*
* @param childs
*/
+<<<<<<< HEAD
public void setChildIMAPFolders(List<IMAPFolder> childs) {
+=======
+ public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
+>>>>>>> first commit
this.childs = childs;
}
@@ -110,7 +127,11 @@ public class IMAPFolder extends EntityBa
*
* @return childs
*/
+<<<<<<< HEAD
public List<IMAPFolder> getChildIMAPFolders() {
+=======
+ public ArrayList<IMAPFolder> getChildIMAPFolders() {
+>>>>>>> first commit
return childs;
}
@@ -204,6 +225,9 @@ public class IMAPFolder extends EntityBa
public int hashCode() {
return getFullName().hashCode();
}
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java Thu Sep 12 02:42:10 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -31,6 +32,10 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -40,6 +45,7 @@ public class DecreaseUnseenEvent extends
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -65,6 +71,16 @@ public class DecreaseUnseenEvent extends
=======
public DecreaseUnseenEvent(User user, IMAPFolderProxy folder, int amount) {
>>>>>>> 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 IMAPFolder folder;
+ private int amount;
+
+ public DecreaseUnseenEvent(User user, IMAPFolder folder) {
+ this(user, folder, 1);
+ }
+
+ public DecreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
+>>>>>>> first commit
this.user =user;
this.folder = folder;
this.amount = amount;
@@ -72,6 +88,7 @@ public class DecreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -79,6 +96,9 @@ public class DecreaseUnseenEvent extends
=======
public IMAPFolderProxy getFolder() {
>>>>>>> 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.
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java Thu Sep 12 02:42:10 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
import java.util.ArrayList;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.User;
@@ -30,6 +31,11 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -38,10 +44,14 @@ public class DeleteMessageEvent extends
public final static Type<DeleteMessageEventHandler> TYPE = new Type<DeleteMessageEventHandler>();
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolderImpl folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolder folder;
+>>>>>>> first commit
private ArrayList<Message> messageList;
@Override
protected void dispatch(DeleteMessageEventHandler handler) {
@@ -54,19 +64,27 @@ public class DeleteMessageEvent extends
}
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageEvent(User user, ImapFolderImpl folder, ArrayList<Message> messageList) {
=======
public DeleteMessageEvent(User user, IMAPFolder folder, ArrayList<Message> messageList) {
>>>>>>> first commit
+=======
+ public DeleteMessageEvent(User user, IMAPFolder folder, ArrayList<Message> messageList) {
+>>>>>>> first commit
this.user = user;
this.folder = folder;
this.messageList = messageList;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageEvent(User user, ImapFolderImpl folder, Message message) {
=======
public DeleteMessageEvent(User user, IMAPFolder folder, Message message) {
>>>>>>> first commit
+=======
+ public DeleteMessageEvent(User user, IMAPFolder folder, Message message) {
+>>>>>>> first commit
ArrayList<Message> mList = new ArrayList<Message>();
mList.add(message);
@@ -79,10 +97,14 @@ public class DeleteMessageEvent extends
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolderImpl getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java Thu Sep 12 02:42:10 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -35,6 +36,11 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.data.IMAPFolder;
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -45,6 +51,7 @@ public class ExpandMessageEvent extends
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private MessageDetails messageDetails;
@@ -59,12 +66,18 @@ public class ExpandMessageEvent extends
public ExpandMessageEvent(User user, IMAPFolderProxy folder, Message message) {
>>>>>>> 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 IMAPFolder folder;
+
+ public ExpandMessageEvent(User user, IMAPFolder folder, Message message) {
+>>>>>>> first commit
this.message = message;
this.folder = folder;
this.user = user;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ExpandMessageEvent(User user, ImapFolder folder, Message message, MessageDetails messageDetails) {
this.message = message;
this.folder = folder;
@@ -76,6 +89,9 @@ public class ExpandMessageEvent extends
=======
public Message getMessage() {
>>>>>>> first commit
+=======
+ public Message getMessage() {
+>>>>>>> first commit
return message;
}
@@ -85,6 +101,7 @@ public class ExpandMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder () {
return folder;
}
@@ -102,6 +119,12 @@ public class ExpandMessageEvent extends
}
>>>>>>> first commit
+=======
+ public IMAPFolder getFolder () {
+ return folder;
+ }
+
+>>>>>>> first commit
@Override
protected void dispatch(ExpandMessageEventHandler handler) {
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java Thu Sep 12 02:42:10 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -31,6 +32,10 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -39,6 +44,7 @@ public class FolderSelectionEvent extend
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
public FolderSelectionEvent(User user, ImapFolder folder) {
@@ -52,12 +58,18 @@ public class FolderSelectionEvent extend
public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
public FolderSelectionEvent(User user, IMAPFolderProxy folder) {
>>>>>>> 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 IMAPFolder folder;
+ public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
+ public FolderSelectionEvent(User user, IMAPFolder folder) {
+>>>>>>> first commit
this.user =user;
this.folder = folder;
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -65,6 +77,9 @@ public class FolderSelectionEvent extend
=======
public IMAPFolderProxy getFolder() {
>>>>>>> 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.
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java Thu Sep 12 02:42:10 2013
@@ -22,15 +22,19 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
import org.apache.hupa.shared.domain.User;
=======
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.Message;
@@ -38,6 +42,8 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.
+=======
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -47,17 +53,21 @@ public class ForwardMessageEvent extends
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private Message message;
private MessageDetails details;
public ForwardMessageEvent(User user, ImapFolder folder, Message message, MessageDetails details) {
=======
+=======
+>>>>>>> first commit
private IMAPFolder folder;
private Message message;
private MessageDetails details;
public ForwardMessageEvent(User user, IMAPFolder folder, Message message, MessageDetails details) {
+<<<<<<< HEAD
>>>>>>> first commit
=======
private IMAPFolderProxy folder;
@@ -66,6 +76,8 @@ public class ForwardMessageEvent extends
public ForwardMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details) {
>>>>>>> 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.
+=======
+>>>>>>> first commit
this.user = user;
this.folder = folder;
this.message = message;
@@ -78,6 +90,7 @@ public class ForwardMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -85,6 +98,9 @@ public class ForwardMessageEvent extends
=======
public IMAPFolderProxy getFolder() {
>>>>>>> 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.
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java Thu Sep 12 02:42:10 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -31,6 +32,10 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -40,6 +45,7 @@ public class IncreaseUnseenEvent extends
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -65,6 +71,16 @@ public class IncreaseUnseenEvent extends
=======
public IncreaseUnseenEvent(User user, IMAPFolderProxy folder, int amount) {
>>>>>>> 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 IMAPFolder folder;
+ private int amount;
+
+ public IncreaseUnseenEvent(User user, IMAPFolder folder) {
+ this(user, folder, 1);
+ }
+
+ public IncreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
+>>>>>>> first commit
this.user =user;
this.folder = folder;
this.amount = amount;
@@ -72,6 +88,7 @@ public class IncreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -79,6 +96,9 @@ public class IncreaseUnseenEvent extends
=======
public IMAPFolderProxy getFolder() {
>>>>>>> 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.
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java Thu Sep 12 02:42:10 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -32,6 +33,10 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -40,6 +45,7 @@ public class LoadMessagesEvent extends G
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private String searchValue;
@@ -65,6 +71,16 @@ public class LoadMessagesEvent extends G
=======
public LoadMessagesEvent(User user, IMAPFolderProxy folder, String searchValue) {
>>>>>>> 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 IMAPFolder folder;
+ private String searchValue;
+
+ public LoadMessagesEvent(User user, IMAPFolder folder) {
+ this(user,folder,null);
+ }
+
+ public LoadMessagesEvent(User user, IMAPFolder folder, String searchValue) {
+>>>>>>> first commit
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
@@ -74,6 +90,7 @@ public class LoadMessagesEvent extends G
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -81,6 +98,9 @@ public class LoadMessagesEvent extends G
=======
public IMAPFolderProxy getFolder() {
>>>>>>> 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.
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoginEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoginEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoginEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoginEvent.java Thu Sep 12 02:42:10 2013
@@ -20,10 +20,14 @@
package org.apache.hupa.shared.events;
<<<<<<< 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 com.google.gwt.event.shared.GwtEvent;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java Thu Sep 12 02:42:10 2013
@@ -20,10 +20,14 @@
package org.apache.hupa.shared.events;
<<<<<<< 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 com.google.gwt.event.shared.GwtEvent;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java Thu Sep 12 02:42:10 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.List;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -32,12 +33,19 @@ import org.apache.hupa.shared.data.Messa
=======
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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 java.util.ArrayList;
+
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.Message;
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
public class MessagesReceivedEvent extends GwtEvent<MessagesReceivedEventHandler>{
public final static Type<MessagesReceivedEventHandler> TYPE = new Type<MessagesReceivedEventHandler>();
<<<<<<< HEAD
+<<<<<<< HEAD
private List<Message> messages;
private ImapFolder folder;
@@ -52,27 +60,40 @@ public class MessagesReceivedEvent exten
=======
public MessagesReceivedEvent(IMAPFolderProxy folder, ArrayList<Message> messages) {
>>>>>>> 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 ArrayList<Message> messages;
+ private IMAPFolder folder;
+
+ public MessagesReceivedEvent(IMAPFolder folder, ArrayList<Message> messages) {
+>>>>>>> first commit
this.messages = messages;
this.folder = folder;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public List<Message> getMessages() {
return messages;
}
public ImapFolder getFolder() {
=======
+=======
+>>>>>>> first commit
public ArrayList<Message> getMessages() {
return messages;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolder getFolder() {
>>>>>>> first commit
=======
public IMAPFolderProxy getFolder() {
>>>>>>> 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.
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java Thu Sep 12 02:42:10 2013
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -73,6 +74,8 @@ public class MoveMessageEvent extends Gw
}
=======
+=======
+>>>>>>> first commit
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -142,4 +145,7 @@ public class MoveMessageEvent extends Gw
}
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java Thu Sep 12 02:42:10 2013
@@ -21,15 +21,19 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
import org.apache.hupa.shared.domain.User;
=======
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.Message;
@@ -37,6 +41,8 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 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.
+=======
+>>>>>>> first commit
import com.google.gwt.event.shared.GwtEvent;
@@ -44,7 +50,11 @@ public class ReplyMessageEvent extends G
public final static Type<ReplyMessageEventHandler> TYPE = new Type<ReplyMessageEventHandler>();
private User user;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
+=======
+ private IMAPFolder folder;
+>>>>>>> first commit
private Message message;
private MessageDetails details;
private boolean replyAll;
@@ -59,7 +69,11 @@ public class ReplyMessageEvent extends G
return TYPE;
}
+<<<<<<< HEAD
public ReplyMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details, boolean replyAll) {
+=======
+ public ReplyMessageEvent(User user, IMAPFolder folder, Message message, MessageDetails details, boolean replyAll) {
+>>>>>>> first commit
this.user = user;
this.folder = folder;
this.message = message;
@@ -71,7 +85,11 @@ public class ReplyMessageEvent extends G
return user;
}
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java Thu Sep 12 02:42:10 2013
@@ -20,10 +20,14 @@
package org.apache.hupa.shared.events;
<<<<<<< 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 com.google.gwt.event.shared.GwtEvent;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java Thu Sep 12 02:42:10 2013
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -29,6 +30,8 @@ public class InvalidSessionException ext
}
}
=======
+=======
+>>>>>>> first commit
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -66,4 +69,7 @@ public class InvalidSessionException ext
super(msg);
}
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java Thu Sep 12 02:42:10 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.rpc;
import java.io.Serializable;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.rpc.IsSerializable;
@@ -84,11 +85,16 @@ public class ContactsResult{
this.contacts = contacts;
}
=======
+=======
+>>>>>>> first commit
import net.customware.gwt.dispatch.shared.Result;
public class ContactsResult implements Result, Serializable {
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
public static class Contact implements Result, Serializable {
private static final long serialVersionUID = -8632580327693416473L;
public String mail;
@@ -137,6 +143,7 @@ public class ContactsResult implements R
public void setContacts(Contact[] contacts) {
this.contacts = contacts;
}
+<<<<<<< HEAD
>>>>>>> first commit
=======
public static class Contact implements Result, Serializable {
@@ -196,5 +203,7 @@ public class ContactsResult implements R
this.contacts = contacts;
}
>>>>>>> constant changed by manolo
+=======
+>>>>>>> first commit
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java Thu Sep 12 02:42:10 2013
@@ -19,13 +19,21 @@
package org.apache.hupa.shared.rpc;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+>>>>>>> first commit
public class DeleteAllMessages extends DeleteMessage{
private static final long serialVersionUID = -6801849429581798842L;
+<<<<<<< HEAD
public DeleteAllMessages(IMAPFolderProxy folder) {
+=======
+ public DeleteAllMessages(IMAPFolder folder) {
+>>>>>>> first commit
super(folder);
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java Thu Sep 12 02:42:10 2013
@@ -23,22 +23,36 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+>>>>>>> first commit
public class DeleteFolder implements Action<GenericResult> , Serializable{
private static final long serialVersionUID = 7921329310932404439L;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public DeleteFolder(IMAPFolderProxy folder) {
+=======
+ private IMAPFolder folder;
+
+ public DeleteFolder(IMAPFolder folder) {
+>>>>>>> first commit
this.folder = folder;
}
protected DeleteFolder() {
}
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java Thu Sep 12 02:42:10 2013
@@ -23,14 +23,24 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+>>>>>>> first commit
public class DeleteMessage implements Action<DeleteMessageResult>, Serializable {
private static final long serialVersionUID = 801294103124082592L;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public DeleteMessage(IMAPFolderProxy folder) {
+=======
+ private IMAPFolder folder;
+
+ public DeleteMessage(IMAPFolder folder) {
+>>>>>>> first commit
this.folder = folder;
}
@@ -38,7 +48,11 @@ public class DeleteMessage implements Ac
}
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
+=======
+ public IMAPFolder getFolder() {
+>>>>>>> first commit
return folder;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org