Author: dongxu Date: Thu Sep 12 03:28:59 2013 New Revision: 1522208 URL: http://svn.apache.org/r1522208 Log: fix issue 4 [4]Attachments do not work
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522208&r1=1522207&r2=1522208&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 03:28:59 2013 @@ -235,7 +235,7 @@ import com.google.web.bindery.requestfac public class MessageSendActivity extends AbstractActivity { - private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>(); + private List<MessageAttachment> attachments = new ArrayList<MessageAttachment>(); private Type type = Type.NEW; private ImapFolder folder; private Message oldmessage; @@ -638,10 +638,19 @@ public class MessageSendActivity extends if (validate()) { sendReq = requestFactory.sendMessageRequest(); message = sendReq.create(SmtpMessage.class); + List<MessageAttachment> attaches = new ArrayList<MessageAttachment>(); + for(MessageAttachment attach : attachments){ + MessageAttachment attachMent = sendReq.create(MessageAttachment.class); + attachMent.setName(attach.getName()); + attachMent.setSize(attach.getSize()); + attachMent.setContentType(attach.getContentType()); + attaches.add(attachMent); + } + message.setFrom(display.getFromText().getText()); message.setSubject(display.getSubjectText().getText()); message.setText(display.getMessageHTML().getHTML()); - message.setMessageAttachments(attachments); + message.setMessageAttachments(attaches); message.setTo(emailTextToArray(display.getToText().getText())); message.setCc(emailTextToArray(display.getCcText().getText())); message.setBcc(emailTextToArray(display.getBccText().getText())); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1522208&r1=1522207&r2=1522208&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java Thu Sep 12 03:28:59 2013 @@ -291,12 +291,17 @@ import org.apache.hupa.shared.domain.Sen import org.apache.hupa.shared.domain.SendMessageAction; import org.apache.hupa.shared.domain.SendReplyMessageAction; import org.apache.hupa.shared.domain.SetFlagAction; +<<<<<<< HEAD import org.apache.hupa.shared.domain.SmtpMessage; >>>>>>> forward and reply message to use RF import org.apache.hupa.shared.domain.Settings; <<<<<<< HEAD >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. ======= +======= +import org.apache.hupa.shared.domain.Settings; +import org.apache.hupa.shared.domain.SmtpMessage; +>>>>>>> fix issue 4 import org.apache.hupa.shared.domain.Tag; >>>>>>> try to fetch messages, yet can not fire the login event in ModelTable >>>>>>> such that just get a NullPointerException in it. import org.apache.hupa.shared.domain.User; @@ -490,6 +495,10 @@ public class GuiceServerModule extends A bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class); + bind(DownloadAttachmentServlet.class).in(Singleton.class); + bind(UploadAttachmentServlet.class).in(Singleton.class); + bind(MessageSourceServlet.class).in(Singleton.class); + bind(Log.class).toProvider(LogProvider.class).in(Singleton.class); bind(Session.class).toProvider(JavaMailSessionProvider.class); <<<<<<< HEAD Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java?rev=1522208&r1=1522207&r2=1522208&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java Thu Sep 12 03:28:59 2013 @@ -37,6 +37,11 @@ import com.google.inject.servlet.Servlet >>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add >>>>>>> license headers to all new files package org.apache.hupa.server.ioc; +import org.apache.hupa.server.servlet.DownloadAttachmentServlet; +import org.apache.hupa.server.servlet.MessageSourceServlet; +import org.apache.hupa.server.servlet.UploadAttachmentServlet; +import org.apache.hupa.shared.SConsts; + import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; @@ -54,10 +59,16 @@ public class GuiceWebModule extends Serv bind(IocRfServlet.class).in(Singleton.class); serve("/gwtRequest").with(IocRfServlet.class); <<<<<<< HEAD +<<<<<<< HEAD serve("/" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD).with(DownloadAttachmentServlet.class); serve("/" + SConsts.HUPA + SConsts.SERVLET_UPLOAD).with(UploadAttachmentServlet.class); serve("/" + SConsts.HUPA + SConsts.SERVLET_SOURCE).with(MessageSourceServlet.class); ======= >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= + serve("/" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD).with(DownloadAttachmentServlet.class); + serve("/" + SConsts.HUPA + SConsts.SERVLET_UPLOAD).with(UploadAttachmentServlet.class); + serve("/" + SConsts.HUPA + SConsts.SERVLET_SOURCE).with(MessageSourceServlet.class); +>>>>>>> fix issue 4 } } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java?rev=1522208&r1=1522207&r2=1522208&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java Thu Sep 12 03:28:59 2013 @@ -95,4 +95,11 @@ public class MessageAttachmentImpl imple public int getSize() { return size; } + + @Override + public void setImage(boolean image) { + //FIXME just for MessageSendActivity's NullPointerException, with adding the RequestContext's create List<MeeageAttachment> + } + + } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java?rev=1522208&r1=1522207&r2=1522208&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java Thu Sep 12 03:28:59 2013 @@ -39,10 +39,16 @@ public interface MessageAttachment exten boolean isImage(); <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> fix issue 4 void setImage(boolean image); String getContentType(); +<<<<<<< HEAD ======= >>>>>>> try to get message details, problem is: +======= +>>>>>>> fix issue 4 } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org