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:43:54 UTC
svn commit: r1522135 - in /james/hupa/trunk:
mock/src/main/java/org/apache/hupa/server/mock/
server/src/main/java/org/apache/hupa/server/
server/src/main/java/org/apache/hupa/server/guice/
server/src/main/java/org/apache/hupa/server/servlet/ src/site/x...
Author: dongxu
Date: Thu Sep 12 02:43:53 2013
New Revision: 1522135
URL: http://svn.apache.org/r1522135
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=1522135&r1=1522134&r2=1522135&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:43:53 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.server.mock;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
@@ -34,6 +35,8 @@ 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;
@@ -44,6 +47,7 @@ import javax.mail.Flags;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
=======
>>>>>>> first commit
@@ -52,6 +56,9 @@ import javax.mail.Flags.Flag;
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+import javax.mail.Flags.Flag;
+>>>>>>> constantly changed by manolo
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
@@ -60,6 +67,7 @@ import javax.mail.Store;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
@@ -85,6 +93,14 @@ import com.sun.mail.imap.IMAPStore;
>>>>>>> constantly changed by manolo
=======
>>>>>>> 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 = '.';
@@ -306,6 +322,7 @@ public class MockIMAPFolder extends IMAP
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public synchronized Message[] search(SearchTerm search)
throws MessagingException {
checkExists();
@@ -329,6 +346,11 @@ public class MockIMAPFolder extends IMAP
public synchronized Message[] search(SearchTerm search)
throws MessagingException {
checkExists();
+=======
+ public synchronized Message[] search(SearchTerm search)
+ throws MessagingException {
+ checkExists();
+>>>>>>> constantly changed by manolo
ArrayList<Message> ret = new ArrayList<Message>();
for (Message m : messages) {
if (search.match(m)) {
@@ -336,9 +358,12 @@ public class MockIMAPFolder extends IMAP
}
}
return ret.toArray(new Message[0]);
+<<<<<<< HEAD
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> 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=1522135&r1=1522134&r2=1522135&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:43:53 2013
@@ -103,6 +103,9 @@ public class InMemoryIMAPStoreCache impl
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
IMAPStore ret = get(user.getName(),user.getPassword());
@@ -113,6 +116,7 @@ public class InMemoryIMAPStoreCache impl
}
return ret;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
return get(user.getName(),user.getPassword());
>>>>>>> first commit
@@ -121,6 +125,8 @@ public class InMemoryIMAPStoreCache impl
=======
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=1522135&r1=1522134&r2=1522135&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:43:53 2013
@@ -107,10 +107,14 @@ public class GuiceServletConfig extends
List<String> configurationList = new ArrayList<String>();
configurationList.add(System.getProperty(SYS_PROP_CONFIG_FILE));
<<<<<<< HEAD
+<<<<<<< HEAD
configurationList.add(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME);
=======
configurationList.add(System.getProperty(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME));
>>>>>>> first commit
+=======
+ configurationList.add(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME);
+>>>>>>> constantly changed by manolo
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=1522135&r1=1522134&r2=1522135&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:43:53 2013
@@ -34,6 +34,7 @@ import org.apache.commons.logging.Log;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.User;
@@ -47,6 +48,9 @@ import org.apache.hupa.shared.data.User;
>>>>>>> first commit
=======
import org.apache.hupa.server.InMemoryIMAPStoreCache;
+=======
+import org.apache.hupa.server.IMAPStoreCache;
+>>>>>>> constantly changed by manolo
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
@@ -64,6 +68,7 @@ public class MessageSourceServlet extend
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPStoreCache cache;
private Log logger;
@@ -88,6 +93,13 @@ public class MessageSourceServlet extend
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+ private IMAPStoreCache cache;
+ private Log logger;
+
+ @Inject
+ public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
+>>>>>>> constantly changed by manolo
this.cache = cache;
this.logger = logger;
}
@@ -128,6 +140,7 @@ public class MessageSourceServlet extend
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
throw new ServletException(msg, e);
=======
throw new ServletException(msg);
@@ -138,6 +151,9 @@ public class MessageSourceServlet extend
=======
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=1522135&r1=1522134&r2=1522135&view=diff
==============================================================================
--- james/hupa/trunk/src/site/xdoc/index.xml (original)
+++ james/hupa/trunk/src/site/xdoc/index.xml Thu Sep 12 02:43:53 2013
@@ -121,10 +121,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-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org