Author: dongxu Date: Thu Sep 12 02:01:24 2013 New Revision: 1522104 URL: http://svn.apache.org/r1522104 Log: constantly changed by manolo
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java james/hupa/trunk/src/site/xdoc/index.xml Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?rev=1522104&r1=1522103&r2=1522104&view=diff ============================================================================== --- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java (original) +++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java Thu Sep 12 02:01:24 2013 @@ -20,11 +20,14 @@ package org.apache.hupa.server.mock; <<<<<<< HEAD +<<<<<<< HEAD ======= import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPStore; >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; @@ -33,15 +36,20 @@ import java.util.List; import javax.mail.FetchProfile; import javax.mail.Flags; <<<<<<< HEAD +<<<<<<< HEAD import javax.mail.Flags.Flag; ======= >>>>>>> first commit +======= +import javax.mail.Flags.Flag; +>>>>>>> constantly changed by manolo import javax.mail.Folder; import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.Store; <<<<<<< HEAD +<<<<<<< HEAD import javax.mail.internet.MimeMessage; import javax.mail.search.SearchTerm; @@ -54,6 +62,14 @@ import javax.mail.internet.MimeMessage; import javax.mail.search.SearchTerm; >>>>>>> first commit +======= +import javax.mail.internet.MimeMessage; +import javax.mail.search.SearchTerm; + +import com.sun.mail.imap.IMAPFolder; +import com.sun.mail.imap.IMAPStore; + +>>>>>>> constantly changed by manolo public class MockIMAPFolder extends IMAPFolder { public static final char SEPARATOR = '.'; @@ -273,6 +289,7 @@ public class MockIMAPFolder extends IMAP @Override <<<<<<< HEAD +<<<<<<< HEAD public synchronized Message[] search(SearchTerm search) throws MessagingException { checkExists(); @@ -289,6 +306,18 @@ public class MockIMAPFolder extends IMAP checkExists(); return getMessages(); >>>>>>> first commit +======= + public synchronized Message[] search(SearchTerm search) + throws MessagingException { + checkExists(); + ArrayList<Message> ret = new ArrayList<Message>(); + for (Message m : messages) { + if (search.match(m)) { + ret.add(m); + } + } + return ret.toArray(new Message[0]); +>>>>>>> constantly changed by manolo } @Override Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java?rev=1522104&r1=1522103&r2=1522104&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java Thu Sep 12 02:01:24 2013 @@ -97,6 +97,9 @@ public class InMemoryIMAPStoreCache impl */ public IMAPStore get(User user) throws MessagingException { <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo IMAPStore ret = get(user.getName(),user.getPassword()); // TODO: this is a hack, we should have a default domain suffix in configuration files @@ -104,9 +107,12 @@ public class InMemoryIMAPStoreCache impl user.setName(user.getName() + "@gmail.com"); } return ret; +<<<<<<< HEAD ======= return get(user.getName(),user.getPassword()); >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo } /* Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java?rev=1522104&r1=1522103&r2=1522104&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java Thu Sep 12 02:01:24 2013 @@ -106,7 +106,7 @@ public class GuiceServletConfig extends if (demoHostName == null || System.getProperty(demoHostName) == null) { List<String> configurationList = new ArrayList<String>(); configurationList.add(System.getProperty(SYS_PROP_CONFIG_FILE)); - configurationList.add(System.getProperty(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME)); + configurationList.add(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME); configurationList.add("/etc/default/hupa"); configurationList.add(servletContextRealPath + "/" + CONFIG_DIR_IN_WAR + CONFIG_FILE_NAME); 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=1522104&r1=1522103&r2=1522104&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:01:24 2013 @@ -32,11 +32,15 @@ import javax.servlet.http.HttpServletRes import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.server.IMAPStoreCache; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.domain.User; ======= import org.apache.hupa.server.InMemoryIMAPStoreCache; +======= +import org.apache.hupa.server.IMAPStoreCache; +>>>>>>> constantly changed by manolo import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.data.User; >>>>>>> first commit @@ -52,6 +56,7 @@ public class MessageSourceServlet extend private static final long serialVersionUID = 1245563204035792963L; <<<<<<< HEAD +<<<<<<< HEAD private IMAPStoreCache cache; private Log logger; @@ -64,6 +69,13 @@ public class MessageSourceServlet extend @Inject public MessageSourceServlet(InMemoryIMAPStoreCache cache, Log logger) { >>>>>>> first commit +======= + private IMAPStoreCache cache; + private Log logger; + + @Inject + public MessageSourceServlet(IMAPStoreCache cache, Log logger) { +>>>>>>> constantly changed by manolo this.cache = cache; this.logger = logger; } @@ -102,10 +114,14 @@ public class MessageSourceServlet extend String msg = "Unable to get raw content of msg for user " + user + " in folder " + folderName + " with uid " + message_uuid; logger.error(msg, e); <<<<<<< HEAD +<<<<<<< HEAD throw new ServletException(msg, e); ======= throw new ServletException(msg); >>>>>>> first commit +======= + throw new ServletException(msg, e); +>>>>>>> constantly changed by manolo } finally { IOUtils.closeQuietly(outs); } Modified: james/hupa/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1522104&r1=1522103&r2=1522104&view=diff ============================================================================== --- james/hupa/trunk/src/site/xdoc/index.xml (original) +++ james/hupa/trunk/src/site/xdoc/index.xml Thu Sep 12 02:01:24 2013 @@ -79,10 +79,16 @@ ======= <h4>Apr/2012 - Hupa evolution accepted</h4> <p> +<<<<<<< HEAD Whe have got a GSOC student who will work with Hupa this Summer <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1" target="_blank">making it better.</a> >>>>>>> first commit +======= + We have got a <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1" + target="_blank">GSOC student</a> who will work with Hupa this Summer + making it better !. +>>>>>>> constantly changed by manolo </p> <h4>Mar/2012 - removed snapshots</h4> <p>Removed snapshot dependencies, updated to last GWT release, --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org