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 ma...@apache.org on 2009/11/27 14:24:52 UTC
svn commit: r884868 [2/2] - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/mvp/
client/src/main/webapp/WEB-INF/ client/war/WEB-INF/
server/src/main/java/org/apache/hupa/server/
server/src/main/java/org/apache/hupa/server/guice/ serve...
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockIMAPStoreCache.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockIMAPStoreCache.java?rev=884868&r1=884867&r2=884868&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockIMAPStoreCache.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockIMAPStoreCache.java Fri Nov 27 13:24:51 2009
@@ -29,30 +29,45 @@
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
+import com.google.inject.Inject;
import com.google.inject.Provider;
import com.sun.mail.imap.IMAPStore;
-public class MockIMAPStoreCache implements IMAPStoreCache{
+public class MockIMAPStoreCache implements IMAPStoreCache {
private Provider<Session> provider;
- private Map<String,String> users = new HashMap<String, String>();
- private Map<String,MockIMAPStore> stores = new HashMap<String, MockIMAPStore>();
+ private Map<String, String> users = new HashMap<String, String>();
+ private Map<String, IMAPStore> stores = new HashMap<String, IMAPStore>();
+
+ @Inject
public MockIMAPStoreCache(Provider<Session> provider) {
- this.provider = provider;
+ this.provider = provider;
}
-
- public void addValidUser(String username, String password) {
+
+ public void addValidUser(User user, IMAPStore store) {
+ addValidUser(user.getName(), user.getPassword(), store);
+ }
+
+ public void addValidUser(String username, String password, IMAPStore store) {
users.put(username, password);
+ stores.put(username, store);
+ }
+
+ public void addValidUser(User user) {
+ addValidUser(user.getName(), user.getPassword());
+ }
+
+ public void addValidUser(String username, String password) {
try {
- stores.put(username, (MockIMAPStore) provider.get().getStore("mockimap"));
+ addValidUser(username, password, (IMAPStore)provider.get().getStore("mockimap"));
} catch (NoSuchProviderException e) {
throw new RuntimeException("Invalid store");
}
}
-
+
public void clear() {
users.clear();
}
-
+
public void delete(User user) {
users.remove(user.getName());
}
@@ -62,11 +77,10 @@
}
public IMAPStore get(User user) throws MessagingException {
- return get(user.getName(),user.getPassword());
+ return get(user.getName(), user.getPassword());
}
- public IMAPStore get(String username, String password)
- throws MessagingException {
+ public IMAPStore get(String username, String password) throws MessagingException {
String pass = users.get(username);
if (pass != null && pass.equals(password)) {
return stores.get(username);
Added: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockLogProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockLogProvider.java?rev=884868&view=auto
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockLogProvider.java (added)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockLogProvider.java Fri Nov 27 13:24:51 2009
@@ -0,0 +1,33 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+
+package org.apache.hupa.server.mock;
+
+import org.apache.commons.logging.Log;
+
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+@Singleton
+public class MockLogProvider implements Provider<Log>{
+ public Log get() {
+ return new MockLog();
+ }
+}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java?rev=884868&r1=884867&r2=884868&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java Fri Nov 27 13:24:51 2009
@@ -9,14 +9,14 @@
public void testDownloadAttachmentByName() throws Exception {
MimeMessage message = loadMessage("7.msg");
- Part part = DownloadAttachmentServlet.handleMultiPart(message
+ Part part = DownloadAttachmentServlet.handleMultiPart(logger, message
.getContent(), "Image.4FB480B138F7456382ABBD1EE7B0748A");
assertNotNull(part);
}
public void testDownloadAttachmentByContentId() throws Exception {
MimeMessage message = loadMessage("7.msg");
- Part part = DownloadAttachmentServlet.handleMultiPart(message
+ Part part = DownloadAttachmentServlet.handleMultiPart(logger, message
.getContent(), "1.1934304663@web28309.mail.ukl.yahoo.com");
assertNotNull(part);
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/Util.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/Util.java?rev=884868&r1=884867&r2=884868&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/Util.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/Util.java Fri Nov 27 13:24:51 2009
@@ -19,7 +19,7 @@
package org.apache.hupa.shared;
-import java.util.ArrayList;
+import java.util.List;
public class Util {
@@ -47,11 +47,11 @@
return string;
}
- public static String arrayToString(ArrayList<String> aList) {
+ public static String listToString(List<String> list) {
StringBuffer sb = new StringBuffer();
- for (int i = 0; i < aList.size(); i++) {
- sb.append(aList.get(i));
- if (i < aList.size()-1) {
+ for (int i = 0; i < list.size(); i++) {
+ sb.append(list.get(i));
+ if (i < list.size()-1) {
sb.append(", ");
}
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java?rev=884868&r1=884867&r2=884868&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java Fri Nov 27 13:24:51 2009
@@ -20,7 +20,7 @@
package org.apache.hupa.shared.data;
import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.List;
public class AbstractMessage implements Serializable{
@@ -30,8 +30,8 @@
private static final long serialVersionUID = 5208272852772006815L;
private String from;
private String subject;
- private ArrayList<String> to;
- private ArrayList<String> cc;
+ private List<String> to;
+ private List<String> cc;
private boolean hasAttachment;
public String toString() {
@@ -80,11 +80,11 @@
}
- public void setCc(ArrayList<String> cc) {
+ public void setCc(List<String> cc) {
this.cc = cc;
}
- public ArrayList<String> getCc() {
+ public List<String> getCc() {
return cc;
}
@@ -106,11 +106,11 @@
return subject;
}
- public ArrayList<String> getTo() {
+ public List<String> getTo() {
return to;
}
- public void setTo( ArrayList<String> to) {
+ public void setTo(List<String> to) {
this.to = to;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java?rev=884868&r1=884867&r2=884868&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java Fri Nov 27 13:24:51 2009
@@ -20,10 +20,11 @@
package org.apache.hupa.shared.data;
import java.util.ArrayList;
+import java.util.List;
public class SMTPMessage extends AbstractMessage{
private static final long serialVersionUID = 7331361994526216161L;
- private ArrayList<String> bcc;
+ private List<String> bcc;
private String text;
private ArrayList<MessageAttachment> aList;
@@ -43,10 +44,10 @@
+ "'\nMessage:\n" + text;
}
- public ArrayList<String> getBcc() {
+ public List<String> getBcc() {
return bcc;
}
- public void setBcc( ArrayList<String> bcc) {
+ public void setBcc( List<String> bcc) {
this.bcc = bcc;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java?rev=884868&r1=884867&r2=884868&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java Fri Nov 27 13:24:51 2009
@@ -42,4 +42,8 @@
return msg;
}
+ public void setMessage(SMTPMessage msg) {
+ this.msg = msg;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org