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 no...@apache.org on 2009/10/23 11:56:53 UTC
svn commit: r828980 [6/10] - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/
client/src/main/java/org/apache/hupa/client/bundles/
client/src/main/java/org/apache/hupa/client/dnd/
client/src/main/java/org/apache/hupa/client/gin/ clien...
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/MoveMessageHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/MoveMessageHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/MoveMessageHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/MoveMessageHandler.java Fri Oct 23 09:56:45 2009
@@ -45,49 +45,49 @@
*/
public class MoveMessageHandler extends AbstractSessionHandler<MoveMessage, MoveMessageResult>{
- @Inject
- public MoveMessageHandler(IMAPStoreCache cache, Log logger,
- Provider<HttpSession> sessionProvider) {
- super(cache, logger, sessionProvider);
- }
+ @Inject
+ public MoveMessageHandler(IMAPStoreCache cache, Log logger,
+ Provider<HttpSession> sessionProvider) {
+ super(cache, logger, sessionProvider);
+ }
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
- */
- protected MoveMessageResult executeInternal(MoveMessage action,
- ExecutionContext context) throws ActionException {
- User user = getUser();
- try {
- IMAPStore store = cache.get(user);
- IMAPFolder folder = (IMAPFolder)store.getFolder(action.getOldFolder().getFullName());
- if (folder.isOpen() == false) {
- folder.open(Folder.READ_WRITE);
- }
- Message m = folder.getMessageByUID(action.getMessageUid());
- Message[] mArray = new Message[] {m};
- folder.copyMessages(mArray, store.getFolder(action.getNewFolder().getFullName()));
- folder.setFlags(mArray, new Flags(Flags.Flag.DELETED), true);
- try {
- folder.expunge(mArray);
- folder.close(false);
- } catch (MessagingException e) {
- // prolly UID expunge is not supported
- folder.close(true);
- }
- return new MoveMessageResult();
- } catch (MessagingException e) {
- logger.error("Error while moving message " + action.getMessageUid() + " from folder " + action.getOldFolder() + " to " + action.getNewFolder(),e);
- throw new ActionException(e);
- }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
+ */
+ protected MoveMessageResult executeInternal(MoveMessage action,
+ ExecutionContext context) throws ActionException {
+ User user = getUser();
+ try {
+ IMAPStore store = cache.get(user);
+ IMAPFolder folder = (IMAPFolder)store.getFolder(action.getOldFolder().getFullName());
+ if (folder.isOpen() == false) {
+ folder.open(Folder.READ_WRITE);
+ }
+ Message m = folder.getMessageByUID(action.getMessageUid());
+ Message[] mArray = new Message[] {m};
+ folder.copyMessages(mArray, store.getFolder(action.getNewFolder().getFullName()));
+ folder.setFlags(mArray, new Flags(Flags.Flag.DELETED), true);
+ try {
+ folder.expunge(mArray);
+ folder.close(false);
+ } catch (MessagingException e) {
+ // prolly UID expunge is not supported
+ folder.close(true);
+ }
+ return new MoveMessageResult();
+ } catch (MessagingException e) {
+ logger.error("Error while moving message " + action.getMessageUid() + " from folder " + action.getOldFolder() + " to " + action.getNewFolder(),e);
+ throw new ActionException(e);
+ }
+ }
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
- */
- public Class<MoveMessage> getActionType() {
- return MoveMessage.class;
- }
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
+ public Class<MoveMessage> getActionType() {
+ return MoveMessage.class;
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/NoopHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/NoopHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/NoopHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/NoopHandler.java Fri Oct 23 09:56:45 2009
@@ -42,36 +42,36 @@
public class NoopHandler extends AbstractSessionHandler<Noop, NoopResult>{
- @Inject
- public NoopHandler(IMAPStoreCache cache, Log logger, Provider<HttpSession> provider) {
- super(cache,logger,provider);
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
- */
- public NoopResult executeInternal(Noop action, ExecutionContext context)
- throws ActionException {
- try {
- IMAPStore store = cache.get(getUser());
- if (store.getURLName() != null &&
- !InMemoryIMAPStoreCache.DEMO_MODE.equals(store.getURLName().getHost()) ) {
- // just send a noop to keep the connection alive
- store.idle();
- }
- return new NoopResult();
- } catch (Exception e) {
- throw new ActionException("Unable to send NOOP " + e.getMessage());
- }
- }
+ @Inject
+ public NoopHandler(IMAPStoreCache cache, Log logger, Provider<HttpSession> provider) {
+ super(cache,logger,provider);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
+ */
+ public NoopResult executeInternal(Noop action, ExecutionContext context)
+ throws ActionException {
+ try {
+ IMAPStore store = cache.get(getUser());
+ if (store.getURLName() != null &&
+ !InMemoryIMAPStoreCache.DEMO_MODE.equals(store.getURLName().getHost()) ) {
+ // just send a noop to keep the connection alive
+ store.idle();
+ }
+ return new NoopResult();
+ } catch (Exception e) {
+ throw new ActionException("Unable to send NOOP " + e.getMessage());
+ }
+ }
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
- */
- public Class<Noop> getActionType() {
- return Noop.class;
- }
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
+ public Class<Noop> getActionType() {
+ return Noop.class;
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java Fri Oct 23 09:56:45 2009
@@ -42,47 +42,47 @@
*/
public class RenameFolderHandler extends AbstractSessionHandler<RenameFolder, GenericResult>{
- @Inject
- public RenameFolderHandler(IMAPStoreCache cache, Log logger,
- Provider<HttpSession> sessionProvider) {
- super(cache, logger, sessionProvider);
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
- */
- protected GenericResult executeInternal(RenameFolder action,
- ExecutionContext context) throws ActionException {
- User user = getUser();
- IMAPFolder folder = action.getFolder();
- String newName = action.getNewName();
- try {
- IMAPStore store = cache.get(user);
- com.sun.mail.imap.IMAPFolder iFolder = (com.sun.mail.imap.IMAPFolder) store.getFolder(folder.getFullName());
- Folder newFolder = store.getFolder(newName);
-
- if (iFolder.isOpen()) {
- iFolder.close(false);
- }
- if (iFolder.renameTo(newFolder)) {
- return new GenericResult();
- }
- throw new ActionException("Unable to rename Folder " + folder.getFullName() + " to " + newName + " for user " + user);
-
- } catch (Exception e) {
- logger.error("Error while renaming Folder " + folder.getFullName() + " to " + newName + " for user " + user,e);
- throw new ActionException("Error while renaming Folder " + folder.getFullName() + " to " + newName + " for user " + user,e);
- }
-
- }
-
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
- */
- public Class<RenameFolder> getActionType() {
- return RenameFolder.class;
- }
+ @Inject
+ public RenameFolderHandler(IMAPStoreCache cache, Log logger,
+ Provider<HttpSession> sessionProvider) {
+ super(cache, logger, sessionProvider);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
+ */
+ protected GenericResult executeInternal(RenameFolder action,
+ ExecutionContext context) throws ActionException {
+ User user = getUser();
+ IMAPFolder folder = action.getFolder();
+ String newName = action.getNewName();
+ try {
+ IMAPStore store = cache.get(user);
+ com.sun.mail.imap.IMAPFolder iFolder = (com.sun.mail.imap.IMAPFolder) store.getFolder(folder.getFullName());
+ Folder newFolder = store.getFolder(newName);
+
+ if (iFolder.isOpen()) {
+ iFolder.close(false);
+ }
+ if (iFolder.renameTo(newFolder)) {
+ return new GenericResult();
+ }
+ throw new ActionException("Unable to rename Folder " + folder.getFullName() + " to " + newName + " for user " + user);
+
+ } catch (Exception e) {
+ logger.error("Error while renaming Folder " + folder.getFullName() + " to " + newName + " for user " + user,e);
+ throw new ActionException("Error while renaming Folder " + folder.getFullName() + " to " + newName + " for user " + user,e);
+ }
+
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
+ public Class<RenameFolder> getActionType() {
+ return RenameFolder.class;
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/ReplyMessageHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/ReplyMessageHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/ReplyMessageHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/ReplyMessageHandler.java Fri Oct 23 09:56:45 2009
@@ -49,43 +49,43 @@
*/
public class ReplyMessageHandler extends AbstractSendMessageHandler<ReplyMessage>{
- @Inject
- public ReplyMessageHandler(Log logger, FileItemRegistry registry,
- IMAPStoreCache store, Provider<HttpSession> provider,
- @Named("SMTPServerAddress") String address, @Named("SMTPServerPort") int port, @Named("SMTPAuth") boolean auth, @Named("SMTPS") boolean useSSL) {
- super(logger, registry, store, provider, address, port, auth, useSSL);
- }
+ @Inject
+ public ReplyMessageHandler(Log logger, FileItemRegistry registry,
+ IMAPStoreCache store, Provider<HttpSession> provider,
+ @Named("SMTPServerAddress") String address, @Named("SMTPServerPort") int port, @Named("SMTPAuth") boolean auth, @Named("SMTPS") boolean useSSL) {
+ super(logger, registry, store, provider, address, port, auth, useSSL);
+ }
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.server.handler.AbstractSendMessageHandler#createMessage(javax.mail.Session, org.apache.hupa.shared.rpc.SendMessage)
- */
- protected Message createMessage(Session session, ReplyMessage action)
- throws AddressException, MessagingException, ActionException {
- IMAPStore store = cache.get(getUser());
- IMAPFolder folder = (IMAPFolder) store.getFolder(action.getFolder().getFullName());
- if (folder.isOpen() == false) {
- folder.open(Folder.READ_ONLY);
- }
- Message rMessage = folder.getMessageByUID(action.getReplyMessageUid()).reply(action.getReplyAll());
- SMTPMessage m = action.getMessage();
- // Use the new recipient list, maybe it has changed
- rMessage.setRecipients(RecipientType.TO, getRecipients(m.getTo()));
- rMessage.setRecipients(RecipientType.CC, getRecipients(m.getCc()));
- rMessage.setRecipients(RecipientType.BCC, getRecipients(m.getBcc()));
- rMessage.setFrom(new InternetAddress(m.getFrom()));
- // replace subject
- rMessage.setSubject(m.getSubject());
- rMessage.saveChanges();
- return rMessage;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.server.handler.AbstractSendMessageHandler#createMessage(javax.mail.Session, org.apache.hupa.shared.rpc.SendMessage)
+ */
+ protected Message createMessage(Session session, ReplyMessage action)
+ throws AddressException, MessagingException, ActionException {
+ IMAPStore store = cache.get(getUser());
+ IMAPFolder folder = (IMAPFolder) store.getFolder(action.getFolder().getFullName());
+ if (folder.isOpen() == false) {
+ folder.open(Folder.READ_ONLY);
+ }
+ Message rMessage = folder.getMessageByUID(action.getReplyMessageUid()).reply(action.getReplyAll());
+ SMTPMessage m = action.getMessage();
+ // Use the new recipient list, maybe it has changed
+ rMessage.setRecipients(RecipientType.TO, getRecipients(m.getTo()));
+ rMessage.setRecipients(RecipientType.CC, getRecipients(m.getCc()));
+ rMessage.setRecipients(RecipientType.BCC, getRecipients(m.getBcc()));
+ rMessage.setFrom(new InternetAddress(m.getFrom()));
+ // replace subject
+ rMessage.setSubject(m.getSubject());
+ rMessage.saveChanges();
+ return rMessage;
+ }
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
- */
- public Class<ReplyMessage> getActionType() {
- return ReplyMessage.class;
- }
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
+ public Class<ReplyMessage> getActionType() {
+ return ReplyMessage.class;
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java Fri Oct 23 09:56:45 2009
@@ -45,34 +45,34 @@
*/
public class SendMessageHandler extends AbstractSendMessageHandler<SendMessage> {
- @Inject
- public SendMessageHandler(Log logger, FileItemRegistry registry,
- IMAPStoreCache store, Provider<HttpSession> provider,@Named("SMTPServerAddress") String address, @Named("SMTPServerPort") int port, @Named("SMTPAuth") boolean auth, @Named("SMTPS") boolean useSSL) {
- super(logger, registry, store, provider, address, port, auth,useSSL);
- }
+ @Inject
+ public SendMessageHandler(Log logger, FileItemRegistry registry,
+ IMAPStoreCache store, Provider<HttpSession> provider,@Named("SMTPServerAddress") String address, @Named("SMTPServerPort") int port, @Named("SMTPAuth") boolean auth, @Named("SMTPS") boolean useSSL) {
+ super(logger, registry, store, provider, address, port, auth,useSSL);
+ }
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.server.handler.AbstractSendMessageHandler#createMessage(javax.mail.Session, org.apache.hupa.shared.rpc.SendMessage)
- */
- protected Message createMessage(Session session, SendMessage action)
- throws AddressException, MessagingException {
- MimeMessage message = new MimeMessage(session);
- SMTPMessage m = action.getMessage();
- message.setFrom(new InternetAddress(m.getFrom()));
- message.setRecipients(RecipientType.TO, getRecipients(m.getTo()));
- message.setRecipients(RecipientType.CC, getRecipients(m.getCc()));
- message.setRecipients(RecipientType.BCC, getRecipients(m.getBcc()));
- message.setSubject(m.getSubject());
- return message;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.server.handler.AbstractSendMessageHandler#createMessage(javax.mail.Session, org.apache.hupa.shared.rpc.SendMessage)
+ */
+ protected Message createMessage(Session session, SendMessage action)
+ throws AddressException, MessagingException {
+ MimeMessage message = new MimeMessage(session);
+ SMTPMessage m = action.getMessage();
+ message.setFrom(new InternetAddress(m.getFrom()));
+ message.setRecipients(RecipientType.TO, getRecipients(m.getTo()));
+ message.setRecipients(RecipientType.CC, getRecipients(m.getCc()));
+ message.setRecipients(RecipientType.BCC, getRecipients(m.getBcc()));
+ message.setSubject(m.getSubject());
+ return message;
+ }
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
- */
- public Class<SendMessage> getActionType() {
- return SendMessage.class;
- }
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
+ public Class<SendMessage> getActionType() {
+ return SendMessage.class;
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java Fri Oct 23 09:56:45 2009
@@ -44,58 +44,58 @@
public class SetFlagsHandler extends AbstractSessionHandler<SetFlag, GenericResult>{
- @Inject
- public SetFlagsHandler(IMAPStoreCache cache, Log logger,
- Provider<HttpSession> sessionProvider) {
- super(cache, logger, sessionProvider);
- }
-
- @Override
- protected GenericResult executeInternal(SetFlag action,
- ExecutionContext context) throws ActionException {
- User user = getUser();
- IMAPFolder folder = action.getFolder();
- ArrayList<Long> uids = action.getUids();
- com.sun.mail.imap.IMAPFolder f = null;
- try {
- IMAPStore store = cache.get(user);
-
- f = (com.sun.mail.imap.IMAPFolder) store.getFolder(folder.getFullName());
- if (f.isOpen() == false) {
- f.open(Folder.READ_WRITE);
- }
- Message[] msgs = f.getMessagesByUID(toArray(uids));
- Flag flag = JavamailUtil.convert(action.getFlag());
- Flags flags = new Flags();
- flags.add(flag);
-
- f.setFlags(msgs, flags, action.getValue());
- return new GenericResult();
- } catch (MessagingException e) {
- String errorMsg = "Error while setting flags of messages with uids " + uids + " for user " + user;
- logger.error(errorMsg,e);
- throw new ActionException(errorMsg,e);
- } finally {
- if (f != null && f.isOpen()) {
- try {
- f.close(false);
- } catch (MessagingException e) {
- // ignore on close
- }
- }
- }
- }
-
- public Class<SetFlag> getActionType() {
- return SetFlag.class;
- }
-
- private long[] toArray(ArrayList<Long> uids) {
- long[] array = new long[uids.size()];
- for (int i = 0; i < uids.size(); i++) {
- array[i] = uids.get(i);
- }
- return array;
- }
+ @Inject
+ public SetFlagsHandler(IMAPStoreCache cache, Log logger,
+ Provider<HttpSession> sessionProvider) {
+ super(cache, logger, sessionProvider);
+ }
+
+ @Override
+ protected GenericResult executeInternal(SetFlag action,
+ ExecutionContext context) throws ActionException {
+ User user = getUser();
+ IMAPFolder folder = action.getFolder();
+ ArrayList<Long> uids = action.getUids();
+ com.sun.mail.imap.IMAPFolder f = null;
+ try {
+ IMAPStore store = cache.get(user);
+
+ f = (com.sun.mail.imap.IMAPFolder) store.getFolder(folder.getFullName());
+ if (f.isOpen() == false) {
+ f.open(Folder.READ_WRITE);
+ }
+ Message[] msgs = f.getMessagesByUID(toArray(uids));
+ Flag flag = JavamailUtil.convert(action.getFlag());
+ Flags flags = new Flags();
+ flags.add(flag);
+
+ f.setFlags(msgs, flags, action.getValue());
+ return new GenericResult();
+ } catch (MessagingException e) {
+ String errorMsg = "Error while setting flags of messages with uids " + uids + " for user " + user;
+ logger.error(errorMsg,e);
+ throw new ActionException(errorMsg,e);
+ } finally {
+ if (f != null && f.isOpen()) {
+ try {
+ f.close(false);
+ } catch (MessagingException e) {
+ // ignore on close
+ }
+ }
+ }
+ }
+
+ public Class<SetFlag> getActionType() {
+ return SetFlag.class;
+ }
+
+ private long[] toArray(ArrayList<Long> uids) {
+ long[] array = new long[uids.size()];
+ for (int i = 0; i < uids.size(); i++) {
+ array[i] = uids.get(i);
+ }
+ return array;
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java Fri Oct 23 09:56:45 2009
@@ -47,60 +47,60 @@
*/
public class TagMessagesHandler extends AbstractSessionHandler<TagMessage, GenericResult>{
- @Inject
- public TagMessagesHandler(IMAPStoreCache cache, Log logger,
- Provider<HttpSession> sessionProvider) {
- super(cache, logger, sessionProvider);
- }
+ @Inject
+ public TagMessagesHandler(IMAPStoreCache cache, Log logger,
+ Provider<HttpSession> sessionProvider) {
+ super(cache, logger, sessionProvider);
+ }
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
- */
- protected GenericResult executeInternal(TagMessage action,
- ExecutionContext context) throws ActionException {
- User user = getUser();
- ArrayList<Long> uids = action.getMessageUids();
- Tag tag = action.getTag();
- IMAPFolder folder = null;
- try {
- IMAPStore store = cache.get(user);
- folder = (IMAPFolder) store.getFolder(action.getFolder().getFullName());
- if (folder.isOpen() == false) {
- folder.open(Folder.READ_WRITE);
- }
- Message[] messages = folder.getMessagesByUID(copyUids(uids));
- for (int i = 0; i < messages.length; i++) {
- Message m = messages[i];
- m.getFlags().add(tag.toString());
- }
- return new GenericResult();
- } catch (MessagingException e) {
- logger.error("Error while tag messages " + uids.toString() + " for user " + user + " of folder" + action.getFolder(), e);
- throw new ActionException(e);
- } finally {
- try {
- folder.close(false);
- } catch (MessagingException e) {
- // ignore on close
- }
- }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.server.handler.AbstractSessionHandler#executeInternal(org.apache.hupa.shared.rpc.Session, net.customware.gwt.dispatch.server.ExecutionContext)
+ */
+ protected GenericResult executeInternal(TagMessage action,
+ ExecutionContext context) throws ActionException {
+ User user = getUser();
+ ArrayList<Long> uids = action.getMessageUids();
+ Tag tag = action.getTag();
+ IMAPFolder folder = null;
+ try {
+ IMAPStore store = cache.get(user);
+ folder = (IMAPFolder) store.getFolder(action.getFolder().getFullName());
+ if (folder.isOpen() == false) {
+ folder.open(Folder.READ_WRITE);
+ }
+ Message[] messages = folder.getMessagesByUID(copyUids(uids));
+ for (int i = 0; i < messages.length; i++) {
+ Message m = messages[i];
+ m.getFlags().add(tag.toString());
+ }
+ return new GenericResult();
+ } catch (MessagingException e) {
+ logger.error("Error while tag messages " + uids.toString() + " for user " + user + " of folder" + action.getFolder(), e);
+ throw new ActionException(e);
+ } finally {
+ try {
+ folder.close(false);
+ } catch (MessagingException e) {
+ // ignore on close
+ }
+ }
+ }
- private long[] copyUids(ArrayList<Long> uids) {
- long[] lArray = new long[uids.size()];
- for (int i = 0; i < uids.size(); i++) {
- lArray[i] = uids.get(i);
- }
- return lArray;
- }
-
- /*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
- */
- public Class<TagMessage> getActionType() {
- return TagMessage.class;
- }
+ private long[] copyUids(ArrayList<Long> uids) {
+ long[] lArray = new long[uids.size()];
+ for (int i = 0; i < uids.size(); i++) {
+ lArray[i] = uids.get(i);
+ }
+ return lArray;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
+ public Class<TagMessage> getActionType() {
+ return TagMessage.class;
+ }
}
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=828980&r1=828979&r2=828980&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 Fri Oct 23 09:56:45 2009
@@ -50,149 +50,149 @@
*/
public class DownloadAttachmentServlet extends HttpServlet {
- /**
- *
- */
- private static final long serialVersionUID = 1245563204035792963L;
- private InMemoryIMAPStoreCache cache;
- private Log logger;
-
- @Inject
- public DownloadAttachmentServlet(InMemoryIMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
- }
-
- @Override
- protected void doPost(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- doGet(request, response);
- }
-
- /**
- * Handle to write back the requested attachment
- */
- @Override
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- String message_uuid = request.getParameter("message_uuid");
- String attachmentName = request.getParameter("attachment_name");
- String sessionId = request.getParameter("sessionId");
- String folderName = request.getParameter("folder_name");
- HttpSession session = request.getSession();
- if (session.getId().equals(sessionId)) {
- response.setContentType("application/download");
- response.setHeader("Content-disposition", "attachment; filename="
- + attachmentName + "");
- InputStream in = null;
- OutputStream out = response.getOutputStream();
-
-
- IMAPFolder folder = null;
- try {
- Store store = cache.get((User) request.getSession().getAttribute(
- "user"));
- folder = (IMAPFolder) store.getFolder(folderName);
- if (folder.isOpen() == false) {
- folder.open(Folder.READ_ONLY);
- }
- Message m = folder.getMessageByUID(Long.parseLong(message_uuid));
- Object content = m.getContent();
- Part part = handleMultiPart(content, attachmentName);
- in = part.getInputStream();
- if (in != null) {
- byte[] buffer = new byte[4096];
- int bytesRead;
- int bytesComplete = 0;
- while ((bytesRead = in.read(buffer)) != -1) {
- bytesComplete = bytesComplete + bytesRead;
- out.write(buffer, 0, bytesRead); // write
- }
- out.flush();
- response.setContentLength(bytesComplete);
- } else {
- response.setContentLength(0);
- }
- } catch (Exception e) {
- logger.error("Error while downloading attachment "
- + attachmentName + " of message " + message_uuid
- + " for sessionId " + sessionId, e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // ignore on close
- }
- }
- if (out != null) {
- try {
- out.close();
- } catch (IOException e) {
- // ignore on close
- }
- }
- if (folder != null) {
- try {
- folder.close(false);
- } catch (MessagingException e) {
- // ignore on close
- }
- }
-
- }
- }
-
- }
-
- /**
- * Loop over MuliPart and write the content to the Outputstream if a
- * attachment with the given name was found.
- *
- * @param out
- * Outputstream to write the content to
- * @param content
- * Content which should checked for attachments
- * @param attachmentName
- * The attachmentname for the searched attachment
- * @throws MessagingException
- * @throws IOException
- */
- private Part handleMultiPart(Object content, String attachmentName)
- throws MessagingException, IOException {
- if (content instanceof Multipart) {
- Multipart part = (Multipart) content;
- for (int i = 0; i < part.getCount(); i++) {
- Part p = part.getBodyPart(i);
- if (isAttachment(p)) {
- if (MimeUtility.decodeText(p.getFileName()).equals(
- attachmentName)) {
- return p;
- }
-
- } else if (p.isMimeType("multipart/*")) {
- return handleMultiPart(p.getContent(), attachmentName);
- }
- }
- }
- return null;
- }
-
- /**
- * Check if the given Part is an attachment
- *
- * @param part
- * @return isAttachment
- * @throws MessagingException
- */
- private boolean isAttachment(Part part) throws MessagingException {
- String disposition = part.getDisposition();
- if (part.getContentType().toLowerCase().startsWith("application/")
- || (disposition != null && (disposition.equals(Part.ATTACHMENT) || disposition
- .equals(Part.INLINE)))) {
- return true;
- }
- return false;
- }
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1245563204035792963L;
+ private InMemoryIMAPStoreCache cache;
+ private Log logger;
+
+ @Inject
+ public DownloadAttachmentServlet(InMemoryIMAPStoreCache cache, Log logger) {
+ this.cache = cache;
+ this.logger = logger;
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ doGet(request, response);
+ }
+
+ /**
+ * Handle to write back the requested attachment
+ */
+ @Override
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ String message_uuid = request.getParameter("message_uuid");
+ String attachmentName = request.getParameter("attachment_name");
+ String sessionId = request.getParameter("sessionId");
+ String folderName = request.getParameter("folder_name");
+ HttpSession session = request.getSession();
+ if (session.getId().equals(sessionId)) {
+ response.setContentType("application/download");
+ response.setHeader("Content-disposition", "attachment; filename="
+ + attachmentName + "");
+ InputStream in = null;
+ OutputStream out = response.getOutputStream();
+
+
+ IMAPFolder folder = null;
+ try {
+ Store store = cache.get((User) request.getSession().getAttribute(
+ "user"));
+ folder = (IMAPFolder) store.getFolder(folderName);
+ if (folder.isOpen() == false) {
+ folder.open(Folder.READ_ONLY);
+ }
+ Message m = folder.getMessageByUID(Long.parseLong(message_uuid));
+ Object content = m.getContent();
+ Part part = handleMultiPart(content, attachmentName);
+ in = part.getInputStream();
+ if (in != null) {
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+ int bytesComplete = 0;
+ while ((bytesRead = in.read(buffer)) != -1) {
+ bytesComplete = bytesComplete + bytesRead;
+ out.write(buffer, 0, bytesRead); // write
+ }
+ out.flush();
+ response.setContentLength(bytesComplete);
+ } else {
+ response.setContentLength(0);
+ }
+ } catch (Exception e) {
+ logger.error("Error while downloading attachment "
+ + attachmentName + " of message " + message_uuid
+ + " for sessionId " + sessionId, e);
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ // ignore on close
+ }
+ }
+ if (out != null) {
+ try {
+ out.close();
+ } catch (IOException e) {
+ // ignore on close
+ }
+ }
+ if (folder != null) {
+ try {
+ folder.close(false);
+ } catch (MessagingException e) {
+ // ignore on close
+ }
+ }
+
+ }
+ }
+
+ }
+
+ /**
+ * Loop over MuliPart and write the content to the Outputstream if a
+ * attachment with the given name was found.
+ *
+ * @param out
+ * Outputstream to write the content to
+ * @param content
+ * Content which should checked for attachments
+ * @param attachmentName
+ * The attachmentname for the searched attachment
+ * @throws MessagingException
+ * @throws IOException
+ */
+ private Part handleMultiPart(Object content, String attachmentName)
+ throws MessagingException, IOException {
+ if (content instanceof Multipart) {
+ Multipart part = (Multipart) content;
+ for (int i = 0; i < part.getCount(); i++) {
+ Part p = part.getBodyPart(i);
+ if (isAttachment(p)) {
+ if (MimeUtility.decodeText(p.getFileName()).equals(
+ attachmentName)) {
+ return p;
+ }
+
+ } else if (p.isMimeType("multipart/*")) {
+ return handleMultiPart(p.getContent(), attachmentName);
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Check if the given Part is an attachment
+ *
+ * @param part
+ * @return isAttachment
+ * @throws MessagingException
+ */
+ private boolean isAttachment(Part part) throws MessagingException {
+ String disposition = part.getDisposition();
+ if (part.getContentType().toLowerCase().startsWith("application/")
+ || (disposition != null && (disposition.equals(Part.ATTACHMENT) || disposition
+ .equals(Part.INLINE)))) {
+ return true;
+ }
+ return false;
+ }
}
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=828980&r1=828979&r2=828980&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 Fri Oct 23 09:56:45 2009
@@ -42,56 +42,56 @@
*/
public class MessageSourceServlet extends HttpServlet {
- private static final long serialVersionUID = 1245563204035792963L;
- private InMemoryIMAPStoreCache cache;
- private Log logger;
-
- @Inject
- public MessageSourceServlet(InMemoryIMAPStoreCache cache, Log logger) {
- this.cache = cache;
- this.logger = logger;
- }
-
- /**
- * Handle to write back the requested attachment
- */
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
- User user = (User) request.getSession().getAttribute("user");
-
- String message_uid = (String) request.getParameter("uid");
- String folder = (String) request.getParameter("folder");
-
- try {
- long uid = Long.parseLong(message_uid);
-
- IMAPStore store = cache.get(user);
- IMAPFolder f = (IMAPFolder) store.getFolder(folder);
- if (f.isOpen() == false) {
- f.open(Folder.READ_ONLY);
- }
-
- Message m = f.getMessageByUID(uid);
-
- response.setContentType("text/plain");
- OutputStream outs = response.getOutputStream();
- m.writeTo(outs);
- outs.flush();
- outs.close();
-
- if (f.isOpen()) {
- f.close(false);
- }
- } catch (Exception e) {
- logger.error("Unable to get raw content of msg for user " + user + " in folder " + folder + " with uid " + message_uid, e);
- throw new ServletException("Unable to get raw content of msg for user " + user + " in folder " + folder + " with uid " + message_uid);
- }
- }
-
- @Override
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doGet(request, response);
- }
+ private static final long serialVersionUID = 1245563204035792963L;
+ private InMemoryIMAPStoreCache cache;
+ private Log logger;
+
+ @Inject
+ public MessageSourceServlet(InMemoryIMAPStoreCache cache, Log logger) {
+ this.cache = cache;
+ this.logger = logger;
+ }
+
+ /**
+ * Handle to write back the requested attachment
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+ User user = (User) request.getSession().getAttribute("user");
+
+ String message_uid = (String) request.getParameter("uid");
+ String folder = (String) request.getParameter("folder");
+
+ try {
+ long uid = Long.parseLong(message_uid);
+
+ IMAPStore store = cache.get(user);
+ IMAPFolder f = (IMAPFolder) store.getFolder(folder);
+ if (f.isOpen() == false) {
+ f.open(Folder.READ_ONLY);
+ }
+
+ Message m = f.getMessageByUID(uid);
+
+ response.setContentType("text/plain");
+ OutputStream outs = response.getOutputStream();
+ m.writeTo(outs);
+ outs.flush();
+ outs.close();
+
+ if (f.isOpen()) {
+ f.close(false);
+ }
+ } catch (Exception e) {
+ logger.error("Unable to get raw content of msg for user " + user + " in folder " + folder + " with uid " + message_uid, e);
+ throw new ServletException("Unable to get raw content of msg for user " + user + " in folder " + folder + " with uid " + message_uid);
+ }
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ doGet(request, response);
+ }
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/UploadAttachmentServlet.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/UploadAttachmentServlet.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/UploadAttachmentServlet.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/UploadAttachmentServlet.java Fri Oct 23 09:56:45 2009
@@ -39,28 +39,28 @@
*/
public class UploadAttachmentServlet extends UploadAction{
- private static final long serialVersionUID = 4936687307133529124L;
- private FileItemRegistry registry;
-
- @Inject
- public UploadAttachmentServlet(FileItemRegistry registry) {
- this.registry = registry;
- }
-
- @Override
- public String executeAction(HttpServletRequest request, List<FileItem> sessionFiles) throws UploadActionException {
- logger.info("Executing Action, files in session: " + sessionFiles.size() + " files in registry: " + registry.size());
- // save file items in the registry
- for(FileItem item: sessionFiles)
- registry.add(item);
-
- // remove items from session but not remove the data from disk or memory
+ private static final long serialVersionUID = 4936687307133529124L;
+ private FileItemRegistry registry;
+
+ @Inject
+ public UploadAttachmentServlet(FileItemRegistry registry) {
+ this.registry = registry;
+ }
+
+ @Override
+ public String executeAction(HttpServletRequest request, List<FileItem> sessionFiles) throws UploadActionException {
+ logger.info("Executing Action, files in session: " + sessionFiles.size() + " files in registry: " + registry.size());
+ // save file items in the registry
+ for(FileItem item: sessionFiles)
+ registry.add(item);
+
+ // remove items from session but not remove the data from disk or memory
removeSessionFileItems(request, false);
return null;
- }
-
- @Override
- public void removeItem(HttpServletRequest request, FileItem item) throws UploadActionException {
- registry.remove(item);
- }
+ }
+
+ @Override
+ public void removeItem(HttpServletRequest request, FileItem item) throws UploadActionException {
+ registry.remove(item);
+ }
}
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=828980&r1=828979&r2=828980&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 Fri Oct 23 09:56:45 2009
@@ -27,54 +27,54 @@
import org.junit.Test;
public class ServerModulTest {
- private String tmpDir = System.getProperty("java.io.tmpdir");
- private ServerModul module = new ServerModul(tmpDir);
+ private String tmpDir = System.getProperty("java.io.tmpdir");
+ private ServerModul module = new ServerModul(tmpDir);
- @Before
- public void setUp() {
- // create config directory
- File f = new File(tmpDir + File.separator + ServerModul.CONF_DIR);
- f.delete();
- f.deleteOnExit();
- f.mkdirs();
- }
-
- @Test
- public void testLoadProperties() throws Exception {
-
- String fileName = tmpDir + File.separator +"foo.properties";
- File file = new File(fileName);
- file.createNewFile();
- Properties p = module.loadProperties(fileName);
- Assert.assertNotNull(p);
- Assert.assertNull(p.get("IMAPServerAddress"));
- file.delete();
-
- // load file from not absolute file
- fileName = tmpDir + File.separator + ServerModul.CONF_DIR + File.separator + "foo2.properties";
- file = new File(fileName);
- file.createNewFile();
- p = module.loadProperties(file.getName());
- Assert.assertNotNull(p);
- Assert.assertNull(p.get("IMAPServerAddress"));
- file.delete();
- }
-
- @Test
- public void testLoadPropertiesWithEmptyFile() throws Exception {
- File tmp = File.createTempFile("foo", ".properties");
- tmp.deleteOnExit();
-
- Properties p = module.loadProperties(tmp.toString());
- Assert.assertNotNull(p);
- Assert.assertNull(p.get("IMAPServerAddress"));
-
- System.setProperty(ServerModul.SYS_PROP_CONFIG_FILE, tmp.toString());
- p = module.loadProperties();
- Assert.assertNotNull(p);
- Assert.assertNull(p.get("IMAPServerAddress"));
- System.clearProperty(ServerModul.SYS_PROP_CONFIG_FILE);
+ @Before
+ public void setUp() {
+ // create config directory
+ File f = new File(tmpDir + File.separator + ServerModul.CONF_DIR);
+ f.delete();
+ f.deleteOnExit();
+ f.mkdirs();
+ }
+
+ @Test
+ public void testLoadProperties() throws Exception {
+
+ String fileName = tmpDir + File.separator +"foo.properties";
+ File file = new File(fileName);
+ file.createNewFile();
+ Properties p = module.loadProperties(fileName);
+ Assert.assertNotNull(p);
+ Assert.assertNull(p.get("IMAPServerAddress"));
+ file.delete();
+
+ // load file from not absolute file
+ fileName = tmpDir + File.separator + ServerModul.CONF_DIR + File.separator + "foo2.properties";
+ file = new File(fileName);
+ file.createNewFile();
+ p = module.loadProperties(file.getName());
+ Assert.assertNotNull(p);
+ Assert.assertNull(p.get("IMAPServerAddress"));
+ file.delete();
+ }
+
+ @Test
+ public void testLoadPropertiesWithEmptyFile() throws Exception {
+ File tmp = File.createTempFile("foo", ".properties");
+ tmp.deleteOnExit();
+
+ Properties p = module.loadProperties(tmp.toString());
+ Assert.assertNotNull(p);
+ Assert.assertNull(p.get("IMAPServerAddress"));
+
+ System.setProperty(ServerModul.SYS_PROP_CONFIG_FILE, tmp.toString());
+ p = module.loadProperties();
+ Assert.assertNotNull(p);
+ Assert.assertNull(p.get("IMAPServerAddress"));
+ System.clearProperty(ServerModul.SYS_PROP_CONFIG_FILE);
- }
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -36,36 +36,36 @@
import junit.framework.TestCase;
public abstract class AbstractHandlerTest extends TestCase{
- public final static String VALID_ID ="VALID_ID";
-
- protected HttpSession session = new MockHttpSession(VALID_ID);
-
- protected MockIMAPStoreCache storeCache = new MockIMAPStoreCache( new Provider<Session>() {
+ public final static String VALID_ID ="VALID_ID";
+
+ protected HttpSession session = new MockHttpSession(VALID_ID);
+
+ protected MockIMAPStoreCache storeCache = new MockIMAPStoreCache( new Provider<Session>() {
- public Session get() {
- Session session = Session.getDefaultInstance(new Properties());
- session.addProvider(MockIMAPStore.getProvider());
- return session;
- }
-
- });
-
- protected Provider<HttpSession> sessionProvider = new Provider<HttpSession>() {
- public HttpSession get() {
- return session;
- }
-
- };
-
- public void tearDown() {
- storeCache.clear();
- }
-
- protected User createUser() {
- User user = new User();
- user.setName("test");
- user.setPassword("password");
- user.setSettings(new Settings());
- return user;
- }
+ public Session get() {
+ Session session = Session.getDefaultInstance(new Properties());
+ session.addProvider(MockIMAPStore.getProvider());
+ return session;
+ }
+
+ });
+
+ protected Provider<HttpSession> sessionProvider = new Provider<HttpSession>() {
+ public HttpSession get() {
+ return session;
+ }
+
+ };
+
+ public void tearDown() {
+ storeCache.clear();
+ }
+
+ protected User createUser() {
+ User user = new User();
+ user.setName("test");
+ user.setPassword("password");
+ user.setSettings(new Settings());
+ return user;
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -35,72 +35,72 @@
public class CreateFolderHandlerTest extends AbstractHandlerTest{
-
- public void testCreate() throws MessagingException {
- User user = createUser();
+
+ public void testCreate() throws MessagingException {
+ User user = createUser();
- session.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
- IMAPFolder folder = createFolder();
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- Folder f1 = store.getFolder(folder.getFullName());
- assertFalse("not exists",f1.exists());
-
- CreateFolderHandler handler = new CreateFolderHandler(storeCache,new MockLog(),sessionProvider);
- try {
- handler.execute(new CreateFolder(folder), null);
- Folder f = store.getFolder(folder.getFullName());
- assertTrue("exists",f.exists());
-
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
-
- }
-
-
- public void testDuplicateFolder() throws MessagingException {
- User user = createUser();
+ session.setAttribute("user", user);
+ storeCache.addValidUser(user.getName(),user.getPassword());
+ IMAPFolder folder = createFolder();
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ Folder f1 = store.getFolder(folder.getFullName());
+ assertFalse("not exists",f1.exists());
+
+ CreateFolderHandler handler = new CreateFolderHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ handler.execute(new CreateFolder(folder), null);
+ Folder f = store.getFolder(folder.getFullName());
+ assertTrue("exists",f.exists());
+
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+
+ }
+
+
+ public void testDuplicateFolder() throws MessagingException {
+ User user = createUser();
- session.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
- IMAPFolder folder = createFolder();
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- Folder f1 = store.getFolder(folder.getFullName());
-
- f1.create(Folder.HOLDS_FOLDERS);
+ session.setAttribute("user", user);
+ storeCache.addValidUser(user.getName(),user.getPassword());
+ IMAPFolder folder = createFolder();
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ Folder f1 = store.getFolder(folder.getFullName());
+
+ f1.create(Folder.HOLDS_FOLDERS);
- CreateFolderHandler handler = new CreateFolderHandler(storeCache,new MockLog(),sessionProvider);
- try {
- handler.execute(new CreateFolder(folder), null);
- fail("Folder already exists");
- } catch (ActionException e) {
- // folder already exists
- // e.printStackTrace();
- }
-
- }
-
- public void testInvalidSessionId() {
- IMAPFolder folder = createFolder();
- CreateFolderHandler handler = new CreateFolderHandler(storeCache,new MockLog(),sessionProvider);
- try {
- handler.execute(new CreateFolder(folder), null);
- fail("Invalid session");
-
- } catch (InvalidSessionException e) {
- // e.printStackTrace();
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- private IMAPFolder createFolder() {
- IMAPFolder folder = new IMAPFolder();
- folder.setFullName("NewFolder");
- folder.setDelimiter(String.valueOf(MockIMAPFolder.SEPERATOR));
- return folder;
- }
+ CreateFolderHandler handler = new CreateFolderHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ handler.execute(new CreateFolder(folder), null);
+ fail("Folder already exists");
+ } catch (ActionException e) {
+ // folder already exists
+ // e.printStackTrace();
+ }
+
+ }
+
+ public void testInvalidSessionId() {
+ IMAPFolder folder = createFolder();
+ CreateFolderHandler handler = new CreateFolderHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ handler.execute(new CreateFolder(folder), null);
+ fail("Invalid session");
+
+ } catch (InvalidSessionException e) {
+ // e.printStackTrace();
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ private IMAPFolder createFolder() {
+ IMAPFolder folder = new IMAPFolder();
+ folder.setFullName("NewFolder");
+ folder.setDelimiter(String.valueOf(MockIMAPFolder.SEPERATOR));
+ return folder;
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -34,65 +34,65 @@
public class DeleteFolderHandlerTest extends AbstractHandlerTest{
- public void testDelete() throws MessagingException {
- User user = createUser();
+ public void testDelete() throws MessagingException {
+ User user = createUser();
- session.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
- IMAPFolder folder = createFolder();
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- Folder f1 = store.getFolder(folder.getFullName());
- f1.create(Folder.HOLDS_FOLDERS);
-
- DeleteFolderHandler handler = new DeleteFolderHandler(storeCache,new MockLog(),sessionProvider);
-
- try {
- handler.execute(new DeleteFolder(folder), null);
- Folder f = store.getFolder(folder.getFullName());
- assertFalse("not exists",f.exists());
-
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
-
- }
-
- public void testDeleteNonExistFolder() throws MessagingException {
- User user = createUser();
-
- session.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
- IMAPFolder folder = createFolder();
- DeleteFolderHandler handler = new DeleteFolderHandler(storeCache,new MockLog(),sessionProvider);
-
- try {
- handler.execute(new DeleteFolder(folder), null);
- fail("Folder should not exist");
- } catch (ActionException e) {
- //e.printStackTrace();
- }
- }
-
- public void testInvalidSessionId() {
- IMAPFolder folder = createFolder();
- DeleteFolderHandler handler = new DeleteFolderHandler(storeCache,new MockLog(),sessionProvider);
- try {
- handler.execute(new DeleteFolder(folder), null);
- fail("Invalid session");
-
- } catch (InvalidSessionException e) {
- //e.printStackTrace();
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- private IMAPFolder createFolder() {
- IMAPFolder folder = new IMAPFolder();
- folder.setFullName("NewFolder");
- folder.setDelimiter(String.valueOf(MockIMAPFolder.SEPERATOR));
- return folder;
- }
+ session.setAttribute("user", user);
+ storeCache.addValidUser(user.getName(),user.getPassword());
+ IMAPFolder folder = createFolder();
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ Folder f1 = store.getFolder(folder.getFullName());
+ f1.create(Folder.HOLDS_FOLDERS);
+
+ DeleteFolderHandler handler = new DeleteFolderHandler(storeCache,new MockLog(),sessionProvider);
+
+ try {
+ handler.execute(new DeleteFolder(folder), null);
+ Folder f = store.getFolder(folder.getFullName());
+ assertFalse("not exists",f.exists());
+
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+
+ }
+
+ public void testDeleteNonExistFolder() throws MessagingException {
+ User user = createUser();
+
+ session.setAttribute("user", user);
+ storeCache.addValidUser(user.getName(),user.getPassword());
+ IMAPFolder folder = createFolder();
+ DeleteFolderHandler handler = new DeleteFolderHandler(storeCache,new MockLog(),sessionProvider);
+
+ try {
+ handler.execute(new DeleteFolder(folder), null);
+ fail("Folder should not exist");
+ } catch (ActionException e) {
+ //e.printStackTrace();
+ }
+ }
+
+ public void testInvalidSessionId() {
+ IMAPFolder folder = createFolder();
+ DeleteFolderHandler handler = new DeleteFolderHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ handler.execute(new DeleteFolder(folder), null);
+ fail("Invalid session");
+
+ } catch (InvalidSessionException e) {
+ //e.printStackTrace();
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ private IMAPFolder createFolder() {
+ IMAPFolder folder = new IMAPFolder();
+ folder.setFullName("NewFolder");
+ folder.setDelimiter(String.valueOf(MockIMAPFolder.SEPERATOR));
+ return folder;
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -40,90 +40,90 @@
public class DeleteMessageByUidHandlerTest extends AbstractHandlerTest{
-
- public void testDeleteFolderNotExists() throws MessagingException {
- DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache,new MockLog(),sessionProvider);
-
- User user = createUser();
- storeCache.addValidUser(user.getName(), user.getPassword());
- session.setAttribute("user", user);
- IMAPFolder folder = new IMAPFolder();
- folder.setFullName("NOT_EXISTS");
- DeleteMessageByUid action = new DeleteMessageByUid(folder,new ArrayList<Long>());
-
- try {
- handler.execute(action, null);
- fail("Folder should not exists!");
- } catch (ActionException e) {
- //e.printStackTrace();
- }
- }
-
- public void testDeleteFolderExistsAndNotTrash() throws MessagingException {
- Session s = Session.getInstance(new Properties());
- DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache,new MockLog(),sessionProvider);
-
- User user = createUser();
- storeCache.addValidUser(user.getName(), user.getPassword());
- session.setAttribute("user", user);
- IMAPFolder folder = new IMAPFolder();
- folder.setFullName("EXISTS");
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- store.clear();
-
- MockIMAPFolder f = (MockIMAPFolder)store.getFolder(folder.getFullName());
- f.create(Folder.HOLDS_FOLDERS);
- f.addMessages(new Message[] { new MimeMessage(s), new MimeMessage(s), new MimeMessage(s)});
- ArrayList<Long> uids = new ArrayList<Long>();
- uids.add(new Long(1));
- uids.add(new Long(3));
- DeleteMessageByUid action = new DeleteMessageByUid(folder, uids);
-
- MockIMAPFolder f3 = (MockIMAPFolder) store.getFolder(user.getSettings().getTrashFolderName());
- assertFalse("Trash folder not exists yet",f3.exists());
-
- try {
- DeleteMessageResult result = handler.execute(action, null);
- int count = result.getCount();
- assertEquals("Only 1 message left", 1, f.getMessageCount());
-
- MockIMAPFolder f2 = (MockIMAPFolder) store.getFolder(user.getSettings().getTrashFolderName());
- assertTrue("Trash folder created",f2.exists());
- assertEquals("2 messages moved", 2, f2.getMessageCount());
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- public void testDeleteFolderExistsAndIsTrash() throws MessagingException {
- Session s = Session.getInstance(new Properties());
- DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache,new MockLog(),sessionProvider);
-
- User user = createUser();
- storeCache.addValidUser(user.getName(), user.getPassword());
- session.setAttribute("user", user);
- IMAPFolder folder = new IMAPFolder();
- folder.setFullName(user.getSettings().getTrashFolderName());
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- store.clear();
-
- MockIMAPFolder f = (MockIMAPFolder)store.getFolder(folder.getFullName());
- f.create(Folder.HOLDS_FOLDERS);
- f.addMessages(new Message[] { new MimeMessage(s), new MimeMessage(s), new MimeMessage(s)});
- ArrayList<Long> uids = new ArrayList<Long>();
- uids.add(new Long(1));
- uids.add(new Long(3));
- DeleteMessageByUid action = new DeleteMessageByUid(folder, uids);
-
- try {
- DeleteMessageResult result = handler.execute(action, null);
- int count = result.getCount();
-
- assertEquals("Only 1 message left", 1, f.getMessageCount());
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
+
+ public void testDeleteFolderNotExists() throws MessagingException {
+ DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache,new MockLog(),sessionProvider);
+
+ User user = createUser();
+ storeCache.addValidUser(user.getName(), user.getPassword());
+ session.setAttribute("user", user);
+ IMAPFolder folder = new IMAPFolder();
+ folder.setFullName("NOT_EXISTS");
+ DeleteMessageByUid action = new DeleteMessageByUid(folder,new ArrayList<Long>());
+
+ try {
+ handler.execute(action, null);
+ fail("Folder should not exists!");
+ } catch (ActionException e) {
+ //e.printStackTrace();
+ }
+ }
+
+ public void testDeleteFolderExistsAndNotTrash() throws MessagingException {
+ Session s = Session.getInstance(new Properties());
+ DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache,new MockLog(),sessionProvider);
+
+ User user = createUser();
+ storeCache.addValidUser(user.getName(), user.getPassword());
+ session.setAttribute("user", user);
+ IMAPFolder folder = new IMAPFolder();
+ folder.setFullName("EXISTS");
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ store.clear();
+
+ MockIMAPFolder f = (MockIMAPFolder)store.getFolder(folder.getFullName());
+ f.create(Folder.HOLDS_FOLDERS);
+ f.addMessages(new Message[] { new MimeMessage(s), new MimeMessage(s), new MimeMessage(s)});
+ ArrayList<Long> uids = new ArrayList<Long>();
+ uids.add(new Long(1));
+ uids.add(new Long(3));
+ DeleteMessageByUid action = new DeleteMessageByUid(folder, uids);
+
+ MockIMAPFolder f3 = (MockIMAPFolder) store.getFolder(user.getSettings().getTrashFolderName());
+ assertFalse("Trash folder not exists yet",f3.exists());
+
+ try {
+ DeleteMessageResult result = handler.execute(action, null);
+ int count = result.getCount();
+ assertEquals("Only 1 message left", 1, f.getMessageCount());
+
+ MockIMAPFolder f2 = (MockIMAPFolder) store.getFolder(user.getSettings().getTrashFolderName());
+ assertTrue("Trash folder created",f2.exists());
+ assertEquals("2 messages moved", 2, f2.getMessageCount());
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ public void testDeleteFolderExistsAndIsTrash() throws MessagingException {
+ Session s = Session.getInstance(new Properties());
+ DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache,new MockLog(),sessionProvider);
+
+ User user = createUser();
+ storeCache.addValidUser(user.getName(), user.getPassword());
+ session.setAttribute("user", user);
+ IMAPFolder folder = new IMAPFolder();
+ folder.setFullName(user.getSettings().getTrashFolderName());
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ store.clear();
+
+ MockIMAPFolder f = (MockIMAPFolder)store.getFolder(folder.getFullName());
+ f.create(Folder.HOLDS_FOLDERS);
+ f.addMessages(new Message[] { new MimeMessage(s), new MimeMessage(s), new MimeMessage(s)});
+ ArrayList<Long> uids = new ArrayList<Long>();
+ uids.add(new Long(1));
+ uids.add(new Long(3));
+ DeleteMessageByUid action = new DeleteMessageByUid(folder, uids);
+
+ try {
+ DeleteMessageResult result = handler.execute(action, null);
+ int count = result.getCount();
+
+ assertEquals("Only 1 message left", 1, f.getMessageCount());
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -36,61 +36,61 @@
public class FetchFoldersHandlerTest extends AbstractHandlerTest{
- public void testInvalidSessionId() {
- User user = createUser();
- FetchFoldersHandler handler = new FetchFoldersHandler(storeCache,new MockLog(),sessionProvider);
- try {
- handler.execute(new FetchFolders(), null);
- fail("Invalid session");
-
- } catch (InvalidSessionException e) {
- //e.printStackTrace();
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- public void testNoFolders() {
- User user = createUser();
- session.setAttribute("user", user);
- storeCache.addValidUser(user.getName(), user.getPassword());
- FetchFoldersHandler handler = new FetchFoldersHandler(storeCache,new MockLog(),sessionProvider);
- try {
- FetchFoldersResult result = handler.execute(new FetchFolders(), null);
- assertTrue(result.getFolders().isEmpty());
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- public void testFoundFolders() throws MessagingException {
- User user = createUser();
- session.setAttribute("user", user);
- storeCache.addValidUser(user.getName(), user.getPassword());
-
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- store.getFolder("INBOX.WHATEVER").create(Folder.HOLDS_FOLDERS);
- store.getFolder("INBOX.WHATEVER1").create(Folder.HOLDS_FOLDERS);
- store.getFolder("INBOX.WHATEVER.XXX").create(Folder.HOLDS_FOLDERS);
+ public void testInvalidSessionId() {
+ User user = createUser();
+ FetchFoldersHandler handler = new FetchFoldersHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ handler.execute(new FetchFolders(), null);
+ fail("Invalid session");
+
+ } catch (InvalidSessionException e) {
+ //e.printStackTrace();
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ public void testNoFolders() {
+ User user = createUser();
+ session.setAttribute("user", user);
+ storeCache.addValidUser(user.getName(), user.getPassword());
+ FetchFoldersHandler handler = new FetchFoldersHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ FetchFoldersResult result = handler.execute(new FetchFolders(), null);
+ assertTrue(result.getFolders().isEmpty());
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ public void testFoundFolders() throws MessagingException {
+ User user = createUser();
+ session.setAttribute("user", user);
+ storeCache.addValidUser(user.getName(), user.getPassword());
+
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ store.getFolder("INBOX.WHATEVER").create(Folder.HOLDS_FOLDERS);
+ store.getFolder("INBOX.WHATEVER1").create(Folder.HOLDS_FOLDERS);
+ store.getFolder("INBOX.WHATEVER.XXX").create(Folder.HOLDS_FOLDERS);
- FetchFoldersHandler handler = new FetchFoldersHandler(storeCache,new MockLog(),sessionProvider);
- try {
- FetchFoldersResult result = handler.execute(new FetchFolders(), null);
- ArrayList<IMAPFolder> folders = result.getFolders();
- assertFalse(folders.isEmpty());
- assertEquals(3, folders.size());
- assertEquals("INBOX.WHATEVER",folders.get(0).getFullName());
- assertEquals("INBOX.WHATEVER1",folders.get(1).getFullName());
- assertEquals("INBOX.WHATEVER.XXX",folders.get(2).getFullName());
- assertEquals("XXX",folders.get(2).getName());
+ FetchFoldersHandler handler = new FetchFoldersHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ FetchFoldersResult result = handler.execute(new FetchFolders(), null);
+ ArrayList<IMAPFolder> folders = result.getFolders();
+ assertFalse(folders.isEmpty());
+ assertEquals(3, folders.size());
+ assertEquals("INBOX.WHATEVER",folders.get(0).getFullName());
+ assertEquals("INBOX.WHATEVER1",folders.get(1).getFullName());
+ assertEquals("INBOX.WHATEVER.XXX",folders.get(2).getFullName());
+ assertEquals("XXX",folders.get(2).getName());
- assertEquals("INBOX.WHATEVER.XXX",folders.get(0).getChildIMAPFolders().get(0).getFullName());
+ assertEquals("INBOX.WHATEVER.XXX",folders.get(0).getChildIMAPFolders().get(0).getFullName());
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
- }
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -30,39 +30,39 @@
import com.google.inject.Provider;
public class LoginUserHandlerTest extends AbstractHandlerTest{
- private LoginUserHandler handler = new LoginUserHandler(storeCache, new MockLog(),sessionProvider, new Provider<Settings>() {
+ private LoginUserHandler handler = new LoginUserHandler(storeCache, new MockLog(),sessionProvider, new Provider<Settings>() {
- public Settings get() {
- return new Settings();
- }
- });
- public void testInvalidLogin() {
- try {
- handler.execute(new LoginUser("invalid","invalid"), null);
- fail("Should throw an exception");
- } catch (ActionException e) {
- //e.printStackTrace();
- }
- assertNull("no user stored in session", session.getAttribute("user"));
- }
-
- public void testValidLogin() {
- String username = "valid";
- String password = "valid";
- storeCache.addValidUser(username, password);
-
- try {
- LoginUserResult result = handler.execute(new LoginUser(username,password), null);
- User u = result.getUser();
-
- assertEquals("Authenticated", true, u.getAuthenticated());
- assertEquals("Authenticated", username, u.getName());
- assertEquals("Authenticated", password, u.getPassword());
- assertEquals("User stored in session", u, session.getAttribute("user"));
- } catch (ActionException e) {
- e.printStackTrace();
- fail("Should throw an exception");
- }
- }
-
+ public Settings get() {
+ return new Settings();
+ }
+ });
+ public void testInvalidLogin() {
+ try {
+ handler.execute(new LoginUser("invalid","invalid"), null);
+ fail("Should throw an exception");
+ } catch (ActionException e) {
+ //e.printStackTrace();
+ }
+ assertNull("no user stored in session", session.getAttribute("user"));
+ }
+
+ public void testValidLogin() {
+ String username = "valid";
+ String password = "valid";
+ storeCache.addValidUser(username, password);
+
+ try {
+ LoginUserResult result = handler.execute(new LoginUser(username,password), null);
+ User u = result.getUser();
+
+ assertEquals("Authenticated", true, u.getAuthenticated());
+ assertEquals("Authenticated", username, u.getName());
+ assertEquals("Authenticated", password, u.getPassword());
+ assertEquals("User stored in session", u, session.getAttribute("user"));
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail("Should throw an exception");
+ }
+ }
+
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -29,25 +29,25 @@
public class LogoutUserHandlerTest extends AbstractHandlerTest{
-
- public void testLogout() {
- String username = "test";
- String password = "pass";
- User user = new User();
- user.setName(username);
- user.setPassword(password);
- user.setAuthenticated(true);
- session.setAttribute("user", user);
- LogoutUserHandler handler = new LogoutUserHandler(storeCache,new MockLog(),sessionProvider);
- try {
- LogoutUserResult result = handler.execute(new LogoutUser(), null);
- assertFalse("Not authenticated anymore", result.getUser().getAuthenticated());
- assertNull("User removed", session.getAttribute("user"));
-
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
- }
-
- }
+
+ public void testLogout() {
+ String username = "test";
+ String password = "pass";
+ User user = new User();
+ user.setName(username);
+ user.setPassword(password);
+ user.setAuthenticated(true);
+ session.setAttribute("user", user);
+ LogoutUserHandler handler = new LogoutUserHandler(storeCache,new MockLog(),sessionProvider);
+ try {
+ LogoutUserResult result = handler.execute(new LogoutUser(), null);
+ assertFalse("Not authenticated anymore", result.getUser().getAuthenticated());
+ assertNull("User removed", session.getAttribute("user"));
+
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
+ }
+
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/NoopHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/NoopHandlerTest.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/NoopHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/NoopHandlerTest.java Fri Oct 23 09:56:45 2009
@@ -28,20 +28,20 @@
public class NoopHandlerTest extends AbstractHandlerTest{
- public void testNoop() {
- NoopHandler handler = new NoopHandler(storeCache,new MockLog(),sessionProvider);
- User user = createUser();
- Noop action = new Noop();
- storeCache.addValidUser(user.getName(), user.getPassword());
- session.setAttribute("user", user);
- try {
- NoopResult result = handler.execute(action, null);
- assertNotNull(result);
- } catch (ActionException e) {
- e.printStackTrace();
- fail();
+ public void testNoop() {
+ NoopHandler handler = new NoopHandler(storeCache,new MockLog(),sessionProvider);
+ User user = createUser();
+ Noop action = new Noop();
+ storeCache.addValidUser(user.getName(), user.getPassword());
+ session.setAttribute("user", user);
+ try {
+ NoopResult result = handler.execute(action, null);
+ assertNotNull(result);
+ } catch (ActionException e) {
+ e.printStackTrace();
+ fail();
- }
-
- }
+ }
+
+ }
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockHttpSession.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockHttpSession.java?rev=828980&r1=828979&r2=828980&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockHttpSession.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockHttpSession.java Fri Oct 23 09:56:45 2009
@@ -32,100 +32,100 @@
@SuppressWarnings("deprecation")
public class MockHttpSession implements HttpSession{
- private Map<String,Object> attributeMap = new HashMap<String, Object>();
- private Map<String,Object> valueMap = new HashMap<String, Object>();
- private long cTime;
- private String id;
-
- public MockHttpSession(String id) {
- cTime = System.currentTimeMillis();
- this.id = id;
- }
-
- public Object getAttribute(String name) {
- return attributeMap.get(name);
- }
-
-
- @SuppressWarnings("unchecked")
- public Enumeration getAttributeNames() {
- return new Enumeration() {
- Iterator it = attributeMap.keySet().iterator();
- public boolean hasMoreElements() {
- return it.hasNext();
- }
-
- public Object nextElement() {
- return it.next();
- }
-
- };
- }
-
- public long getCreationTime() {
- return cTime;
- }
-
- public String getId() {
- return id;
- }
-
- public long getLastAccessedTime() {
- return 0;
- }
-
- public int getMaxInactiveInterval() {
- return 0;
- }
-
- public ServletContext getServletContext() {
- return null;
- }
-
- public HttpSessionContext getSessionContext() {
- return null;
- }
-
- public Object getValue(String name) {
- return valueMap.get(name);
- }
-
- public String[] getValueNames() {
- List<String> names = new ArrayList<String>();
- Iterator<String> it = valueMap.keySet().iterator();
- while (it.hasNext()) {
- names.add(it.next());
- }
- return names.toArray(new String[names.size()]);
- }
-
- public void invalidate() {
- }
-
- public boolean isNew() {
- return false;
- }
-
- public void putValue(String name, Object value) {
- valueMap.put(name, value);
- }
-
- public void removeAttribute(String name) {
- attributeMap.remove(name);
- }
-
- public void removeValue(String name) {
- valueMap.remove(name);
-
- }
-
- public void setAttribute(String name, Object value) {
- attributeMap.put(name, value);
- }
-
- public void setMaxInactiveInterval(int interval) {
- // TODO Auto-generated method stub
-
- }
+ private Map<String,Object> attributeMap = new HashMap<String, Object>();
+ private Map<String,Object> valueMap = new HashMap<String, Object>();
+ private long cTime;
+ private String id;
+
+ public MockHttpSession(String id) {
+ cTime = System.currentTimeMillis();
+ this.id = id;
+ }
+
+ public Object getAttribute(String name) {
+ return attributeMap.get(name);
+ }
+
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getAttributeNames() {
+ return new Enumeration() {
+ Iterator it = attributeMap.keySet().iterator();
+ public boolean hasMoreElements() {
+ return it.hasNext();
+ }
+
+ public Object nextElement() {
+ return it.next();
+ }
+
+ };
+ }
+
+ public long getCreationTime() {
+ return cTime;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public long getLastAccessedTime() {
+ return 0;
+ }
+
+ public int getMaxInactiveInterval() {
+ return 0;
+ }
+
+ public ServletContext getServletContext() {
+ return null;
+ }
+
+ public HttpSessionContext getSessionContext() {
+ return null;
+ }
+
+ public Object getValue(String name) {
+ return valueMap.get(name);
+ }
+
+ public String[] getValueNames() {
+ List<String> names = new ArrayList<String>();
+ Iterator<String> it = valueMap.keySet().iterator();
+ while (it.hasNext()) {
+ names.add(it.next());
+ }
+ return names.toArray(new String[names.size()]);
+ }
+
+ public void invalidate() {
+ }
+
+ public boolean isNew() {
+ return false;
+ }
+
+ public void putValue(String name, Object value) {
+ valueMap.put(name, value);
+ }
+
+ public void removeAttribute(String name) {
+ attributeMap.remove(name);
+ }
+
+ public void removeValue(String name) {
+ valueMap.remove(name);
+
+ }
+
+ public void setAttribute(String name, Object value) {
+ attributeMap.put(name, value);
+ }
+
+ public void setMaxInactiveInterval(int interval) {
+ // TODO Auto-generated method stub
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org