svn commit: r1671834 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessageContentView.ui.xml TopBarView.ui.xml
Author: manolo
Date: Tue Apr 7 12:32:29 2015
New Revision: 1671834
URL: http://svn.apache.org/r1671834
Log:
Disable about until implemented
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml?rev=1671834&r1=1671833&r2=1671834&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
Tue Apr 7 12:32:29 2015
@@ -41,6 +41,7 @@
@sprite .emptyMsg {
gwt-image: 'originLogo';
background-position: center center;
+background-size: 20%;
width: auto;
}
@@ -66,4 +67,4 @@
-
\ No newline at end of file
+
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml?rev=1671834&r1=1671833&r2=1671834&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
Tue Apr 7 12:32:29 2015
@@ -36,7 +36,8 @@
}
.about {
-display: inline-block;
+/* Disabled until fixed: display: inline-block; */
+display: none;
padding: 4px 0.8em 0 10px;
color: #AAA;
text-decoration: none;
@@ -107,4 +108,4 @@
-
\ No newline at end of file
+
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1671618 - /james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/dialog/Dialog.java
Author: manolo
Date: Mon Apr 6 17:29:08 2015
New Revision: 1671618
URL: http://svn.apache.org/r1671618
Log:
Fix callback not working in alert dialog widget
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/dialog/Dialog.java
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/dialog/Dialog.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/dialog/Dialog.java?rev=1671618&r1=1671617&r2=1671618&view=diff
==
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/dialog/Dialog.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/dialog/Dialog.java
Mon Apr 6 17:29:08 2015
@@ -28,7 +28,7 @@ public class Dialog {
}
public static void alert(Object msg, Command callback) {
-dialog(msg, false, null, null);
+dialog(msg, false, callback, null);
okButton.setFocus(true);
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1671550 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Author: manolo
Date: Mon Apr 6 15:23:10 2015
New Revision: 1671550
URL: http://svn.apache.org/r1671550
Log:
Fix remove one message
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1671550&r1=1671549&r2=1671550&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Mon Apr 6 15:23:10 2015
@@ -19,6 +19,8 @@
package org.apache.hupa.client.activity;
+import static com.google.gwt.query.client.GQuery.console;
+
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
@@ -166,23 +168,23 @@ public class MessageListActivity extends
private void bindTo(final EventBus eventBus) {
-eventBus.addHandler(DeleteClickEvent.TYPE, new
DeleteClickEventHandler() {
+registerHandler(eventBus.addHandler(DeleteClickEvent.TYPE, new
DeleteClickEventHandler() {
@Override
public void onDeleteClickEvent(DeleteClickEvent event) {
deleteSelectedMessages();
}
-});
+}));
-eventBus.addHandler(RefreshMessagesEvent.TYPE, new
RefreshMessagesEventHandler() {
+registerHandler(eventBus.addHandler(RefreshMessagesEvent.TYPE, new
RefreshMessagesEventHandler() {
@Override
public void onRefresh(RefreshMessagesEvent event) {
display.setSearchValue(event.getSearchValue());
display.refresh();
System.out.println("REFRESH DISPLAY");
}
-});
+}));
-eventBus.addHandler(MoveMessageEvent.TYPE, new
MoveMessageEventHandler() {
+registerHandler(eventBus.addHandler(MoveMessageEvent.TYPE, new
MoveMessageEventHandler() {
@Override
public void onMoveMessageHandler(final MoveMessageEvent event) {
@@ -231,9 +233,9 @@ public class MessageListActivity extends
});
}
-});
+}));
-eventBus.addHandler(MessageViewEvent.TYPE, new
MessageViewEventHandler() {
+registerHandler(eventBus.addHandler(MessageViewEvent.TYPE, new
MessageViewEventHandler() {
public void onMessageViewEvent(final MessageViewEvent event) {
if (event.messageDetails != null && gettingMessages != null) {
gettingMessages.done(new Function() {
@@ -262,9 +264,9 @@ public class MessageListActivity extends
});
}
}
-});
+}));
-eventBus.addHandler(MessageListRangeChangedEvent.TYPE, new
MessageListRangeChangedEventHandler() {
+registerHandler(eventBus.addHandler(MessageListRangeChangedEvent.TYPE,
new MessageListRangeChangedEventHandler() {
public void onRangeChangedEvent(MessageListRangeChangedEvent
event) {
gettingMessages = hupaStorage
.gettingMessages(true, folderName, event.start, event.size,
event.search)
@@ -288,7 +290,7 @@ public class MessageListActivity extends
});
}
-});
+}));
}
@@ -320,9 +322,10 @@ public class MessageListActivity extends
}
}
private void deleteSelectedMessages() {
+
final List uids = display.getSelectedMessagesIds();
-if (uids.size() > 1) {
+if (uids.size() > 0) {
Dialog.confirm("Do you want to delete selected messages?", new
Command() {
public void execute() {
doDelete(uids);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1671549 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Author: manolo
Date: Mon Apr 6 15:21:26 2015
New Revision: 1671549
URL: http://svn.apache.org/r1671549
Log:
Do not send messages twice
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1671549&r1=1671548&r2=1671549&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Mon Apr 6 15:21:26 2015
@@ -83,6 +83,7 @@ public class ComposeActivity extends App
private List attachments = new
ArrayList();
protected ComposePlace place;
private User user;
+private boolean sending;
public Activity with(ComposePlace place) {
this.place = place;
@@ -223,7 +224,7 @@ public class ComposeActivity extends App
return ret;
}
protected void bindTo(EventBus eventBus) {
-eventBus.addHandler(AddressClickEvent.TYPE, new
AddressClickEventHandler() {
+registerHandler(eventBus.addHandler(AddressClickEvent.TYPE, new
AddressClickEventHandler() {
@Override
public void onClick(AddressClickEvent event) {
String to = display.getTo().getText();
@@ -233,23 +234,23 @@ public class ComposeActivity extends App
display.getTo().setText(event.getEmail());
}
}
-});
-eventBus.addHandler(SendClickEvent.TYPE, new SendClickEventHandler() {
+}));
+registerHandler(eventBus.addHandler(SendClickEvent.TYPE, new
SendClickEventHandler() {
public void onSendClick(SendClickEvent event) {
send();
}
-});
-eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
+}));
+registerHandler(eventBus.addHandler(LoginEvent.TYPE, new
LoginEventHandler() {
public void onLogin(LoginEvent event) {
user = event.getUser();
}
-});
-eventBus.addHandler(AttachClickEvent.TYPE, new
AttachClickEventHandler() {
+}));
+registerHandler(eventBus.addHandler(AttachClickEvent.TYPE, new
AttachClickEventHandler() {
public void onAttachClick(AttachClickEvent event) {
display.getAttachButton().fireEvent(new ClickEvent() {
});
}
-});
+}));
registerHandler(display.getSendClick().addClickHandler(sendClickHandler));
registerHandler(display.getCancelClick().addClickHandler(cancelClickHandler));
@@ -305,12 +306,12 @@ public class ComposeActivity extends App
registerHandler(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler));
registerHandler(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler));
-eventBus.addHandler(MailToEvent.TYPE, new MailToEventHandler() {
+registerHandler(eventBus.addHandler(MailToEvent.TYPE, new
MailToEventHandler() {
@Override
public void onMailTo(MailToEvent event) {
display.getTo().setText(event.getMailto());
}
-});
+}));
fillSuggestList();
@@ -378,6 +379,7 @@ public class ComposeActivity extends App
protected void send() {
if (!validate())
return;
+sending = true;
hupaController.showTopLoading("Sending...");
MessageDetails oldDetails = place.getParameters().getOldDetails();
@@ -429,7 +431,8 @@ public class ComposeActivity extends App
}
private boolean validate() {
// Don't trust only in view validation
-return display.validate() && display.getTo().getText().trim().length()
> 0
+return !sending
+&& display.validate() &&
display.getTo().getText().trim().length() > 0
&&
EmailListValidator.isValidAddressList(display.getTo().getText())
&&
EmailListValidator.isValidAddressList(display.getCc().getText())
&&
EmailListValidator.isValidAddressList(display.getBcc().getText());
@@ -467,6 +470,7 @@ public class ComposeActivity extends App
}
private void afterSend(GenericResult response) {
+sending = false;
hupaController.hideTopLoading();
hupaController.showNotice("Your mail has been sent.", 1);
History.back();
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1660222 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/public/Hupa-sd.html hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml
Author: manolo Date: Mon Feb 16 22:07:11 2015 New Revision: 1660222 URL: http://svn.apache.org/r1660222 Log: Latest GWT use SD by default, linker must be xsiframe Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/public/Hupa-sd.html Modified: james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml Modified: james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1660222&r1=1660221&r2=1660222&view=diff == --- james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml (original) +++ james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml Mon Feb 16 22:07:11 2015 @@ -29,9 +29,12 @@ - + + + + - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1660221 - in /james/hupa/trunk: .gitignore hupa/pom.xml
Author: manolo
Date: Mon Feb 16 22:06:14 2015
New Revision: 1660221
URL: http://svn.apache.org/r1660221
Log:
Fix manifest issues with embedded jetty
Modified:
james/hupa/trunk/.gitignore
james/hupa/trunk/hupa/pom.xml
Modified: james/hupa/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1660221&r1=1660220&r2=1660221&view=diff
==
--- james/hupa/trunk/.gitignore (original)
+++ james/hupa/trunk/.gitignore Mon Feb 16 22:06:14 2015
@@ -19,3 +19,4 @@ DS_Store
*.swp
.factorypath
.DS_Store
+MANIFEST.MF
Modified: james/hupa/trunk/hupa/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/hupa/pom.xml?rev=1660221&r1=1660220&r2=1660221&view=diff
==
--- james/hupa/trunk/hupa/pom.xml (original)
+++ james/hupa/trunk/hupa/pom.xml Mon Feb 16 22:06:14 2015
@@ -194,6 +194,14 @@
+
+
+prepare-package
+
+manifest
+
+
+
org.apache.maven.plugins
@@ -281,6 +289,7 @@
org.eclipse.jetty,javax.servlet
jsp-api,jstl
+META-INF/**
${project.build.directory}/${project.artifactId}-${project.version}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1660219 - /james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Author: manolo
Date: Mon Feb 16 22:04:04 2015
New Revision: 1660219
URL: http://svn.apache.org/r1660219
Log:
Implement new stub methods in tests
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java?rev=1660219&r1=1660218&r2=1660219&view=diff
==
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Mon Feb 16 22:04:04 2015
@@ -208,4 +208,34 @@ public class MockUploader implements IUp
public void setEnabled(boolean b) {
// TODO Auto-generated method stub
}
+
+@Override
+public Widget asWidget() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public String getServerRawResponse() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setServerMessage(ServerMessage msg) {
+ // TODO Auto-generated method stub
+
+}
+
+@Override
+public void setMultipleSelection(boolean b) {
+ // TODO Auto-generated method stub
+
+}
+
+@Override
+public ServerMessage getServerMessage() {
+ // TODO Auto-generated method stub
+ return null;
+}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1660218 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
Author: manolo
Date: Mon Feb 16 22:03:34 2015
New Revision: 1660218
URL: http://svn.apache.org/r1660218
Log:
Adjust upload icon size
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml?rev=1660218&r1=1660217&r2=1660218&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
Mon Feb 16 22:03:34 2015
@@ -216,7 +216,7 @@
}
.attachImage,.attachText {
-height: 27px;
+height: 16px;
cursor: pointer;
color: blue;
float: left;
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1660217 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Author: manolo
Date: Mon Feb 16 22:02:55 2015
New Revision: 1660217
URL: http://svn.apache.org/r1660217
Log:
Fix the way to register uploaded files wiht new gwt-upload
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1660217&r1=1660216&r2=1660217&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Mon Feb 16 22:02:55 2015
@@ -24,6 +24,7 @@ import gwtupload.client.IUploader;
import gwtupload.client.IUploader.OnCancelUploaderHandler;
import gwtupload.client.IUploader.OnFinishUploaderHandler;
import gwtupload.client.IUploader.OnStatusChangedHandler;
+import gwtupload.client.IUploader.UploadedInfo;
import java.util.ArrayList;
import java.util.Iterator;
@@ -329,14 +330,16 @@ public class ComposeActivity extends App
private OnFinishUploaderHandler onFinishUploadHandler = new
OnFinishUploaderHandler() {
public void onFinish(IUploader uploader) {
if (uploader.getStatus() == Status.SUCCESS) {
-MessageAttachment attachment = new MessageAttachmentImpl();
// We use the fileInputName (unique) instead of the fileName so
// as we
// can find the item in the registry.
-attachment.setName(uploader.getInputName());
-attachment.setContentType(uploader.getServerInfo().ctype);
-attachment.setSize(uploader.getServerInfo().size);
-attachments.add(attachment);
+for (UploadedInfo info :
uploader.getServerMessage().getUploadedInfos()) {
+ MessageAttachment attachment = new MessageAttachmentImpl();
+ attachment.setName(info.getField());
+ attachment.setContentType(info.getCtype());
+ attachment.setSize(info.getSize());
+ attachments.add(attachment);
+}
}
}
};
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1659104 - /james/hupa/trunk/pom.xml
Author: manolo Date: Wed Feb 11 22:35:29 2015 New Revision: 1659104 URL: http://svn.apache.org/r1659104 Log: update gwtupload version Modified: james/hupa/trunk/pom.xml Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1659104&r1=1659103&r2=1659104&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Wed Feb 11 22:35:29 2015 @@ -221,17 +221,17 @@ com.googlecode.gwtupload gwtupload -0.6.4 +1.0.3 commons-fileupload commons-fileupload -1.2.2 +1.3.1 commons-io commons-io -2.0.1 +2.3 com.google.inject - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1658140 - in /james/hupa/trunk: client/src/main/java/com/ hupa/src/main/java/com/ pom.xml server/src/main/java/com/
Author: manolo Date: Sun Feb 8 08:11:10 2015 New Revision: 1658140 URL: http://svn.apache.org/r1658140 Log: Update gwt version Removed: james/hupa/trunk/client/src/main/java/com/ james/hupa/trunk/hupa/src/main/java/com/ james/hupa/trunk/server/src/main/java/com/ Modified: james/hupa/trunk/pom.xml Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1658140&r1=1658139&r2=1658140&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Sun Feb 8 08:11:10 2015 @@ -57,11 +57,11 @@ -2.6.1 -2.6.1 +2.7.0 +2.7.0 INFO -8.1.8.v20121106 +8.1.15.v20140411 test true true @@ -326,7 +326,7 @@ com.googlecode.gwtquery gwtquery -1.4.1 +1.4.3 provided - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1613842 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
Author: manolo Date: Sun Jul 27 20:52:57 2014 New Revision: 1613842 URL: http://svn.apache.org/r1613842 Log: Remove another deprecated client logger Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1613842&r1=1613841&r2=1613842&view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Sun Jul 27 20:52:57 2014 @@ -26,7 +26,6 @@ - - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1613840 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
Author: manolo Date: Sun Jul 27 20:44:25 2014 New Revision: 1613840 URL: http://svn.apache.org/r1613840 Log: Remove deprecated client logger Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1613840&r1=1613839&r2=1613840&view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Sun Jul 27 20:44:25 2014 @@ -25,7 +25,6 @@ - - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610777 - in /james/bond/trunk/src/main: java/org/apache/james/bond/server/JamesConnector.java webapp/index.html
Author: manolo
Date: Tue Jul 15 17:55:06 2014
New Revision: 1610777
URL: http://svn.apache.org/r1610777
Log:
Fix NPE when james does not have domains, users or aliases
Modified:
james/bond/trunk/src/main/java/org/apache/james/bond/server/JamesConnector.java
james/bond/trunk/src/main/webapp/index.html
Modified:
james/bond/trunk/src/main/java/org/apache/james/bond/server/JamesConnector.java
URL:
http://svn.apache.org/viewvc/james/bond/trunk/src/main/java/org/apache/james/bond/server/JamesConnector.java?rev=1610777&r1=1610776&r2=1610777&view=diff
==
---
james/bond/trunk/src/main/java/org/apache/james/bond/server/JamesConnector.java
(original)
+++
james/bond/trunk/src/main/java/org/apache/james/bond/server/JamesConnector.java
Tue Jul 15 17:55:06 2014
@@ -40,7 +40,7 @@ import org.apache.james.cli.probe.impl.J
*/
public abstract class JamesConnector {
private static ServerProbe serverProbe;
-
+
public static ServerProbe getServerProbe() throws Exception {
if (serverProbe == null) {
try {
@@ -55,7 +55,7 @@ public abstract class JamesConnector {
/**
* It retrieves all the users from the server
- *
+ *
* @return
* @throws Exception
* if there is any problem
@@ -64,15 +64,16 @@ public abstract class JamesConnector {
List users = new ArrayList();
String[] usersArray = getServerProbe().listUsers();
-for (String username : usersArray)
- users.add(new User(username));
+if (usersArray != null)
+ for (String username : usersArray)
+users.add(new User(username));
return users;
}
-
+
/**
* It adds a new user
- *
+ *
* @param user
* @throws Exception
* if there is a problem in the connection or the user cannot be
@@ -84,7 +85,7 @@ public abstract class JamesConnector {
/**
* It removes the user from the server
- *
+ *
* @param user
* @throws Exception
* if there is a problem in the connection or the user cannot be
@@ -96,7 +97,7 @@ public abstract class JamesConnector {
/**
* It substitute the user password for the new one
- *
+ *
* @param user
* @throws Exception
* if there is a problem
@@ -107,7 +108,7 @@ public abstract class JamesConnector {
/**
* It retrieves all the domains from the server
- *
+ *
* @return
* @throws Exception
* if there is any problem
@@ -116,15 +117,16 @@ public abstract class JamesConnector {
List domains = new ArrayList();
String[] domainsArray = getServerProbe().listDomains();
-for (String domain : domainsArray)
- domains.add(new Domain(domain));
+if (domainsArray != null)
+ for (String domain : domainsArray)
+domains.add(new Domain(domain));
return domains;
}
/**
* It retrieves all the domain in a {@link Map} from the server
- *
+ *
* @return
* @throws Exception
* if there is any problem
@@ -133,15 +135,16 @@ public abstract class JamesConnector {
Map domains = new HashMap();
String[] domainsArray = getServerProbe().listDomains();
-for (String domain : domainsArray)
- domains.put(domain, new Domain(domain));
+if (domainsArray != null)
+ for (String domain : domainsArray)
+domains.put(domain, new Domain(domain));
return domains;
}
/**
* It adds a new domain
- *
+ *
* @param domain
* @throws Exception
* if there is a problem in the connection or the domain cannot be
@@ -153,7 +156,7 @@ public abstract class JamesConnector {
/**
* It removes the domain from the server
- *
+ *
* @param domain
* @throws Exception
* if there is a problem in the connection or the domain cannot be
@@ -166,7 +169,7 @@ public abstract class JamesConnector {
/**
* It retrieves a Map that contains all mappings. The key is the user@domain
* and the value is a Collection which holds all mappings for that key
- *
+ *
* @return
* @throws Exception
*/
@@ -177,7 +180,7 @@ public abstract class JamesConnector {
/**
* It retrieves a Map that contains all mappings. The key is the user@domain
* and the value is a Collection which holds all mappings for that key
- *
+ *
* @return
* @throws Exception
*/
@@ -187,24 +190,25 @@ public abstract class JamesConnector {
Collection mappingsCollection;
Set mappingsSet;
-for (String userAndDomain : map.keySet()) {
- mappingsCollection = map.get(userAndDomain);
-
- if (mappingsCollection instanceof Set) {
-mappingsSet = (Set) mappingsCollection;
- } else {
-mappingsSet = new HashSet(mappingsCollection);
+if (map != null)
+ for (String userAndDomain : map.keySet()) {
+mappingsCollection = map.get(userAndDomain);
+
svn commit: r1610774 - /james/bond/trunk/pom.xml
Author: manolo Date: Tue Jul 15 17:53:58 2014 New Revision: 1610774 URL: http://svn.apache.org/r1610774 Log: update gwt and jetty versions Modified: james/bond/trunk/pom.xml Modified: james/bond/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/bond/trunk/pom.xml?rev=1610774&r1=1610773&r2=1610774&view=diff == --- james/bond/trunk/pom.xml (original) +++ james/bond/trunk/pom.xml Tue Jul 15 17:53:58 2014 @@ -14,9 +14,9 @@ 1.6 1.6 1.3.2 - 2.5.1 - 2.5.1 - 7.6.9.v20130131 + 2.6.1 + 2.6.1 +8.1.6.v20120903 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610620 - in /james/bond/trunk/src/main/java/org/apache/james/bond: client/AppController.java client/Factory.java client/UserProxy.java server/User.java
Author: manolo Date: Tue Jul 15 08:21:27 2014 New Revision: 1610620 URL: http://svn.apache.org/r1610620 Log: Remove unused classes Removed: james/bond/trunk/src/main/java/org/apache/james/bond/client/AppController.java james/bond/trunk/src/main/java/org/apache/james/bond/client/Factory.java james/bond/trunk/src/main/java/org/apache/james/bond/client/UserProxy.java james/bond/trunk/src/main/java/org/apache/james/bond/server/User.java - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610611 - in /james/bond/trunk: ./ src/main/java/org/apache/james/bond/Bond.gwt.xml
Author: manolo Date: Tue Jul 15 08:11:08 2014 New Revision: 1610611 URL: http://svn.apache.org/r1610611 Log: Speed up gwt compilation Modified: james/bond/trunk/ (props changed) james/bond/trunk/src/main/java/org/apache/james/bond/Bond.gwt.xml Propchange: james/bond/trunk/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 15 08:11:08 2014 @@ -0,0 +1 @@ +target Modified: james/bond/trunk/src/main/java/org/apache/james/bond/Bond.gwt.xml URL: http://svn.apache.org/viewvc/james/bond/trunk/src/main/java/org/apache/james/bond/Bond.gwt.xml?rev=1610611&r1=1610610&r2=1610611&view=diff == --- james/bond/trunk/src/main/java/org/apache/james/bond/Bond.gwt.xml (original) +++ james/bond/trunk/src/main/java/org/apache/james/bond/Bond.gwt.xml Tue Jul 15 08:11:08 2014 @@ -21,7 +21,7 @@ - + @@ -44,7 +44,9 @@ - + - \ No newline at end of file + + + - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610610 - /james/bond/trunk/pom.xml
Author: manolo
Date: Tue Jul 15 08:07:08 2014
New Revision: 1610610
URL: http://svn.apache.org/r1610610
Log:
Fix GWTTestcase tests. Fix m2e eclipse import
Modified:
james/bond/trunk/pom.xml
Modified: james/bond/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/bond/trunk/pom.xml?rev=1610610&r1=1610609&r2=1610610&view=diff
==
--- james/bond/trunk/pom.xml (original)
+++ james/bond/trunk/pom.xml Tue Jul 15 08:07:08 2014
@@ -2,13 +2,14 @@
4.0.0
- Bond gwtquery project
+ Apache James :: Bond
org.apache.james
bond
war
1.0-SNAPSHOT
+3.0-beta4
UTF-8
1.6
1.6
@@ -60,15 +61,15 @@
com.google.gwt
- gwt-dev
+ gwt-servlet
${gwtversion}
- provided
+ runtime
com.google.gwt
- gwt-servlet
+ gwt-dev
${gwtversion}
- runtime
+ test
com.googlecode.gwtquery
@@ -110,13 +111,13 @@
org.apache.james
james-server-cli
- 3.0-beta4
+ ${james}
org.apache.james
apache-james
- 3.0-beta4
+ ${james}
*
@@ -342,15 +343,11 @@
-
-
-
+
-
- org.bsc.maven
- maven-processor-plugin
- 2.0.5
+ maven-compiler-plugin
+ 2.5.1
com.google.web.bindery
@@ -358,17 +355,7 @@
${gwtversion}
-
-
- process
-
- process
-
- generate-sources
-
-
-
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610609 - /james/bond/trunk/src/test/java/org/apache/james/bond/client/serverconnection/AppRequestFactoryTest.java
Author: manolo
Date: Tue Jul 15 08:05:38 2014
New Revision: 1610609
URL: http://svn.apache.org/r1610609
Log:
Fix test so as it creates domain test before running
Modified:
james/bond/trunk/src/test/java/org/apache/james/bond/client/serverconnection/AppRequestFactoryTest.java
Modified:
james/bond/trunk/src/test/java/org/apache/james/bond/client/serverconnection/AppRequestFactoryTest.java
URL:
http://svn.apache.org/viewvc/james/bond/trunk/src/test/java/org/apache/james/bond/client/serverconnection/AppRequestFactoryTest.java?rev=1610609&r1=1610608&r2=1610609&view=diff
==
---
james/bond/trunk/src/test/java/org/apache/james/bond/client/serverconnection/AppRequestFactoryTest.java
(original)
+++
james/bond/trunk/src/test/java/org/apache/james/bond/client/serverconnection/AppRequestFactoryTest.java
Tue Jul 15 08:05:38 2014
@@ -31,6 +31,7 @@ import org.apache.james.bond.TestConst;
import org.apache.james.bond.client.ioc.ClientFactory;
import org.apache.james.bond.client.ioc.ClientFactoryTestImpl;
import
org.apache.james.bond.client.serverconnection.AppRequestFactory.DnsRequest;
+import
org.apache.james.bond.client.serverconnection.AppRequestFactory.DomainRequest;
import
org.apache.james.bond.client.serverconnection.AppRequestFactory.Pop3Request;
import
org.apache.james.bond.client.serverconnection.AppRequestFactory.SmtpRequest;
import
org.apache.james.bond.client.serverconnection.AppRequestFactory.UserRequest;
@@ -53,9 +54,11 @@ public class AppRequestFactoryTest {
@Test
public void userFunctionalityTest() {
+addDomain();
clearUser();
addUser();
removeUser();
+removeDomain();
}
private void clearUser() {
@@ -88,6 +91,25 @@ public class AppRequestFactoryTest {
requestFactory.createUserRequest().listUsers().fire(rec);
}
+ private void addDomain() {
+DomainRequest context = requestFactory.createDomainRequest();
+DomainProxy domain = context.create(DomainProxy.class);
+domain.setDomain("yo.es");
+context.persist(domain).fire();
+ }
+
+ private void removeDomain() {
+requestFactory.createDomainRequest().listDomains().fire(new
Receiver>() {
+ public void onSuccess(List response) {
+for (DomainProxy c : response) {
+ if (c.getDomain().equals("yo.es")) {
+requestFactory.createDomainRequest().remove(c).fire();
+ }
+}
+ }
+});
+ }
+
private void addUser() {
Receiver> rec = new Receiver>() {
public void onSuccess(List users) {
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610608 - /james/bond/trunk/src/main/webapp/index.html
Author: manolo
Date: Tue Jul 15 08:04:43 2014
New Revision: 1610608
URL: http://svn.apache.org/r1610608
Log:
Use index.html as the app bootstrap instead of using redirections
Modified:
james/bond/trunk/src/main/webapp/index.html
Modified: james/bond/trunk/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/james/bond/trunk/src/main/webapp/index.html?rev=1610608&r1=1610607&r2=1610608&view=diff
==
--- james/bond/trunk/src/main/webapp/index.html (original)
+++ james/bond/trunk/src/main/webapp/index.html Tue Jul 15 08:04:43 2014
@@ -1,15 +1,8 @@
+
-
- // a workaround for capturing and passing gwt.codesvr parameter in
development mode
- function goTo(location) {
- window.location = location + window.location.search;
- }
- goTo('bond/bond.html');
-
- Loading ...
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1610607 - in /james/bond/trunk/src/main/java/org/apache/james/bond/public: Bond.html bond.html
Author: manolo Date: Tue Jul 15 07:54:56 2014 New Revision: 1610607 URL: http://svn.apache.org/r1610607 Log: This entry was incorrectly saved in svn because of case problems Removed: james/bond/trunk/src/main/java/org/apache/james/bond/public/Bond.html james/bond/trunk/src/main/java/org/apache/james/bond/public/bond.html - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1606196 - /james/bond/trunk/bond/
Author: manolo Date: Fri Jun 27 19:46:34 2014 New Revision: 1606196 URL: http://svn.apache.org/r1606196 Log: remove empty folder Removed: james/bond/trunk/bond/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1606195 - in /james/bond/trunk: .classpath .project README.txt bond/.classpath bond/.project bond/README.txt bond/pom.xml bond/src/ pom.xml src/
Author: manolo Date: Fri Jun 27 19:45:33 2014 New Revision: 1606195 URL: http://svn.apache.org/r1606195 Log: moving bond folder one level up Added: james/bond/trunk/.classpath - copied unchanged from r1606194, james/bond/trunk/bond/.classpath james/bond/trunk/.project - copied unchanged from r1606194, james/bond/trunk/bond/.project james/bond/trunk/README.txt - copied unchanged from r1606194, james/bond/trunk/bond/README.txt james/bond/trunk/pom.xml - copied unchanged from r1606194, james/bond/trunk/bond/pom.xml james/bond/trunk/src/ - copied from r1606194, james/bond/trunk/bond/src/ Removed: james/bond/trunk/bond/.classpath james/bond/trunk/bond/.project james/bond/trunk/bond/README.txt james/bond/trunk/bond/pom.xml james/bond/trunk/bond/src/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1606194 - in /james/bond/trunk/bond: .classpath .project README.txt bond/ pom.xml src/
Author: manolo Date: Fri Jun 27 19:44:40 2014 New Revision: 1606194 URL: http://svn.apache.org/r1606194 Log: moving bond folder one level up Added: james/bond/trunk/bond/.classpath - copied unchanged from r1606149, james/bond/trunk/bond/bond/.classpath james/bond/trunk/bond/.project - copied unchanged from r1606149, james/bond/trunk/bond/bond/.project james/bond/trunk/bond/README.txt - copied unchanged from r1606149, james/bond/trunk/bond/bond/README.txt james/bond/trunk/bond/pom.xml - copied unchanged from r1606149, james/bond/trunk/bond/bond/pom.xml james/bond/trunk/bond/src/ - copied from r1606149, james/bond/trunk/bond/bond/src/ Removed: james/bond/trunk/bond/bond/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1606189 - in /james/bond/trunk: .gitignore .netrc .netrc.swp bond/.settings/ bond/bond/.gwt/ bond/bond/.settings/ bond/bond/target/ bond/src/ test.txt
Author: manolo Date: Fri Jun 27 19:41:46 2014 New Revision: 1606189 URL: http://svn.apache.org/r1606189 Log: Remove unneeded stuff in bond Removed: james/bond/trunk/.netrc james/bond/trunk/.netrc.swp james/bond/trunk/bond/.settings/ james/bond/trunk/bond/bond/.gwt/ james/bond/trunk/bond/bond/.settings/ james/bond/trunk/bond/bond/target/ james/bond/trunk/bond/src/ james/bond/trunk/test.txt Modified: james/bond/trunk/.gitignore Modified: james/bond/trunk/.gitignore URL: http://svn.apache.org/viewvc/james/bond/trunk/.gitignore?rev=1606189&r1=1606188&r2=1606189&view=diff == --- james/bond/trunk/.gitignore (original) +++ james/bond/trunk/.gitignore Fri Jun 27 19:41:46 2014 @@ -1 +1,3 @@ -/bond +.gwt +.settings +target - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1603360 - /james/hupa/trunk/pom.xml
Author: manolo Date: Wed Jun 18 06:36:58 2014 New Revision: 1603360 URL: http://svn.apache.org/r1603360 Log: update jetty version so as super-dev-mode does work fine Modified: james/hupa/trunk/pom.xml Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1603360&r1=1603359&r2=1603360&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Wed Jun 18 06:36:58 2014 @@ -61,7 +61,7 @@ 2.6.1 INFO -7.3.0.v20110203 +8.1.8.v20121106 test true true - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1587256 - in /james/hupa/trunk: mock/pom.xml pom.xml server/pom.xml shared/pom.xml
Author: manolo Date: Mon Apr 14 16:48:18 2014 New Revision: 1587256 URL: http://svn.apache.org/r1587256 Log: Update guice groupId Modified: james/hupa/trunk/mock/pom.xml james/hupa/trunk/pom.xml james/hupa/trunk/server/pom.xml james/hupa/trunk/shared/pom.xml Modified: james/hupa/trunk/mock/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1587256&r1=1587255&r2=1587256&view=diff == --- james/hupa/trunk/mock/pom.xml (original) +++ james/hupa/trunk/mock/pom.xml Mon Apr 14 16:48:18 2014 @@ -81,15 +81,11 @@ commons-io -com.google.code.guice +com.google.inject guice -com.google.code.guice -guice-assistedinject - - -com.google.code.guice +com.google.inject.extensions guice-servlet Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1587256&r1=1587255&r2=1587256&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Mon Apr 14 16:48:18 2014 @@ -234,17 +234,12 @@ 2.0.1 -com.google.code.guice +com.google.inject guice 3.0 -com.google.code.guice -guice-assistedinject -3.0 - - -com.google.code.guice +com.google.inject.extensions guice-servlet 3.0 Modified: james/hupa/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1587256&r1=1587255&r2=1587256&view=diff == --- james/hupa/trunk/server/pom.xml (original) +++ james/hupa/trunk/server/pom.xml Mon Apr 14 16:48:18 2014 @@ -81,15 +81,11 @@ commons-io -com.google.code.guice +com.google.inject guice -com.google.code.guice -guice-assistedinject - - -com.google.code.guice +com.google.inject.extensions guice-servlet Modified: james/hupa/trunk/shared/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1587256&r1=1587255&r2=1587256&view=diff == --- james/hupa/trunk/shared/pom.xml (original) +++ james/hupa/trunk/shared/pom.xml Mon Apr 14 16:48:18 2014 @@ -35,7 +35,7 @@ gwt-user -com.google.code.guice +com.google.inject guice - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1579571 - /james/hupa/trunk/pom.xml
Author: manolo
Date: Thu Mar 20 09:17:54 2014
New Revision: 1579571
URL: http://svn.apache.org/r1579571
Log:
Fix site doc creation due to a maven issue
Modified:
james/hupa/trunk/pom.xml
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1579571&r1=1579570&r2=1579571&view=diff
==
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Mar 20 09:17:54 2014
@@ -386,6 +386,11 @@
${gwtMavenVersion}
+org.apache.maven.plugins
+maven-site-plugin
+3.3
+
+
org.bsc.maven
maven-processor-plugin
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1579567 - /james/hupa/trunk/src/site/resources/demo/index.html
Author: manolo
Date: Thu Mar 20 09:03:39 2014
New Revision: 1579567
URL: http://svn.apache.org/r1579567
Log:
Fix site doc
Modified:
james/hupa/trunk/src/site/resources/demo/index.html
Modified: james/hupa/trunk/src/site/resources/demo/index.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1579567&r1=1579566&r2=1579567&view=diff
==
--- james/hupa/trunk/src/site/resources/demo/index.html (original)
+++ james/hupa/trunk/src/site/resources/demo/index.html Thu Mar 20 09:03:39 2014
@@ -72,14 +72,6 @@ p {
margin-top: 5px;
margin-bottom: 0px;
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-===
->>>>>>> constantly changed by manolo
-===
->>>>>>> constantly changed by manolo
.red {
font-weight: bold;
color: red;
@@ -89,7 +81,6 @@ pre {
font-family: courier;
font-size: 14px;
}
-<<<<<<< HEAD
@@ -102,29 +93,7 @@ pre {
var s = document.getElementsByTagName('script').item(0);
s.parentNode.insertBefore(ga, s);
})();
-<<<<<<< HEAD
-===
->>>>>>> first commit
-===
->>>>>>> constantly changed by manolo
-===
-
->>>>>>> first commit
-===
-
-
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-1384591-1']);
- _gaq.push(['_trackPageview']);
- (function() {
-var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? '<a rel="nofollow" href="https://ssl">https://ssl</a>' :
'<a rel="nofollow" href="http://www">http://www</a>') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script').item(0);
s.parentNode.insertBefore(ga, s);
- })();
-
->>>>>>> constantly changed by manolo
@@ -135,86 +104,15 @@ pre {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
-Hupa in Demo mode:
-===
You can select one of our demo instances:
Hupa in Demo mode: http:
->>>>>>> first commit
-===
-
-
-Hupa in Demo mode:
->>>>>>> constantly changed by manolo
-===
-You can select one of our demo instances:
-
-Hupa in Demo mode: http:
->>>>>>> first commit
-===
-
-
-Hupa in Demo mode:
->>>>>>> constantly changed by manolo
Username is set to 'demo' and the password is
'demo'
Uses a collection of example messages and stub
implementations of IMAP and SMTP servers.
In this instance you can test almost the Hupa features,
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-but emails you send will never reach the
addressee.
-
-
-
-Hupa for Gmail: We have
-disabled this instance to
avoid risks and legal issues.Nevertheless you can
- https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war";>
download
-the last built of Hupa and run it in your system:
-
-$ java -jar hupa-0.0.2-SNAPSHOT.war
-
- Your instance on Hupa:
-
-Will work with any imap enabled account in gmail.
-===
-but emails you send will never reach the addressee,
-and message search is not
implemented.
-===
-but emails you send will never reach the
addressee.
->>>>>>> constantly changed by manolo
-
-
-
-Hupa for Gmail: We have
-disabled this instance to
avoid risks and legal issues.Nevertheless you can
-https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war";>
download
-the
svn commit: r1579559 [23/23] - in /james/hupa/trunk: ./ client/ client/src/main/java/com/google/web/bindery/requestfactory/server/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache
kage org.apache.hupa.widgets.ui;
+
+import org.apache.hupa.widgets.WidgetsCSS;
+
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+
+/**
+ * Widget which shows a Loading state
+ *
+ */
+public class Loading extends Composite {
+
+public Loading(String loadingMsg) {
+initWidget(new HTML(loadingMsg));
+addStyleName(WidgetsCSS.C_loading);
+}
+
+public Loading() {
+this("");
+}
+
+/**
+ * Show the Loading image
+ */
+public void show() {
+setVisible(true);
+}
+
+/**
+ * Hide the Loading image
+ */
+public void hide() {
+setVisible(false);
+}
+
+}
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java?rev=1579559&r1=1579558&r2=1579559&view=diff
======
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
Thu Mar 20 08:16:02 2014
@@ -34,7 +34,7 @@ import com.google.gwt.user.client.ui.Tex
/**
* A text-area which shows a pop-up with suggestions.
* Different values in the text area are separated by comma.
- *
+ *
* @author manolo
*/
public class MultiValueSuggestArea extends Composite implements HasText,
Focusable {
@@ -42,7 +42,7 @@ public class MultiValueSuggestArea exten
/**
* It is necessary to modify the behavior of the default SuggestBox,
because
* it look for items which match the entire text in the box.
- *
+ *
* @author manolo
*/
private class CustomSuggestBox extends SuggestBox {
@@ -52,7 +52,7 @@ public class MultiValueSuggestArea exten
// instead of overriding getText and setText from SuggestBox
because a bug in the implementation
// I've sent a patch to gwt.
super(oracle, new TextArea() {
-
+
{
// Avoid entering a new-line when selecting a suggestion
element
// TODO: I think this is a bug in GWT SuggestBox which
should be reported.
@@ -66,12 +66,12 @@ public class MultiValueSuggestArea exten
}
String search = null;
-
+
@Override
public String getText() {
return search = super.getText().replaceFirst("\\s+$",
"").replaceFirst("^\\s+","").replaceAll("[\\s;]", ",").replaceFirst("^.+,", "");
}
-
+
@Override
public void setText(String text) {
if (text.trim().length() > 0) {
@@ -79,12 +79,12 @@ public class MultiValueSuggestArea exten
super.setText(actual + text + ", ");
}
}
-
+
});
}
// We have to use getValue and setValue to get/set the entire text of
the textarea
-// because setText and getText have different behavior since we have
modified
+// because setText and getText have different behavior since we have
modified
// this methods in the the box implementation
@Override
public String getValue() {
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/NumberOnlyTextBox.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/NumberOnlyTextBox.java?rev=1579559&r1=1579558&r2=1579559&view=diff
==
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/NumberOnlyTextBox.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/NumberOnlyTextBox.java
Thu Mar 20 08:16:02 2014
@@ -24,12 +24,12 @@ import com.google.gwt.event.dom.client.K
import com.google.gwt.user.client.ui.TextBox;
/**
- * TextBox which only allows numbers to get entered
- *
+ * TextBox which only allows numbers to get entered
+ *
*
*/
public class NumberOnlyTextBox extends TextBox implements KeyPressHandler{
-
+
public NumberOnlyTextBox() {
addKeyPressHandler(this);
}
@@ -42,7 +42,7 @@ public class NumberOnlyTextBox extends T
char keyCode = event.getCharCode();
if (!Character.isDigit(keyCode)) {
cancelKey();
-}
+}
}
-
+
}
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/
svn commit: r1577827 [3/3] - in /james/hupa/trunk: server/src/main/java/org/apache/hupa/server/ server/src/main/java/org/apache/hupa/server/ioc/ server/src/main/java/org/apache/hupa/server/service/ se
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java?rev=1577827&r1=1577826&r2=1577827&view=diff
==
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java
Sat Mar 15 10:37:46 2014
@@ -30,23 +30,23 @@ import com.google.web.bindery.requestfac
@ProxyFor(value = ImapFolder.class)
public interface ImapFolder extends ValueProxy, HasName, HasFullName {
- int getUnseenMessageCount();
- List getChildren();
- void setChildren(List children);
- void setUnseenMessageCount(int count);
- void setMessageCount(int realCount);
- int getMessageCount();
- String getDelimiter();
- void setDelimiter(String delimiter);
- void setSubscribed(boolean subscribed);
- boolean getSubscribed();
-
- boolean getHasChildren();
- void setHasChildren(boolean hasChildren);
+int getUnseenMessageCount();
+List getChildren();
+void setChildren(List children);
+void setUnseenMessageCount(int count);
+void setMessageCount(int realCount);
+int getMessageCount();
+String getDelimiter();
+void setDelimiter(String delimiter);
+void setSubscribed(boolean subscribed);
+boolean getSubscribed();
+
+boolean getHasChildren();
+void setHasChildren(boolean hasChildren);
- /**
-* use this to proxy the dumping method, or an alternative to clone,
for the ValueProxy's must be set/get-ter
-* @param folder to be dumped
-*/
- void setFolderTo(ImapFolder folder);
+/**
+ * use this to proxy the dumping method, or an alternative to clone, for
the ValueProxy's must be set/get-ter
+ * @param folder to be dumped
+ */
+void setFolderTo(ImapFolder folder);
}
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java?rev=1577827&r1=1577826&r2=1577827&view=diff
==
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/LogoutUserResult.java
Sat Mar 15 10:37:46 2014
@@ -24,5 +24,5 @@ import com.google.web.bindery.requestfac
@ProxyFor(LogoutUserResult.class)
public interface LogoutUserResult extends ValueProxy{
- User getUser();
+User getUser();
}
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java?rev=1577827&r1=1577826&r2=1577827&view=diff
==
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java
Sat Mar 15 10:37:46 2014
@@ -25,8 +25,8 @@ import com.google.web.bindery.requestfac
@ProxyFor(MailHeader.class)
public interface MailHeader extends ValueProxy{
- String getName();
- String getValue();
- void setName(String s);
+String getName();
+String getValue();
+void setName(String s);
void setValue(String s);
}
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java?rev=1577827&r1=1577826&r2=1577827&view=diff
==
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java
Sat Mar 15 10:37:46 2014
@@ -29,26 +29,26 @@ import com.google.web.bindery.requestfac
@ProxyFor(Message.class)
public interface Message extends ValueProxy {
- List getFlags();
- Date getReceivedDate();
- boolean hasAttachment();
- String getFrom();
- String getSubject();
- List getCc();
- List getTo();
- long getUid();
- String getReplyto();
+List getFlags();
+Date getReceivedDate();
+boolean hasAttachment();
+String getFrom();
+String getSubject();
+List getCc();
+List getTo();
+long getUid();
+String getReplyto();
List getExtra();
- void setTo(List to);
- void setCc(List cc);
- void setReplyto(String
svn commit: r1577826 - in /james/hupa/trunk: server/src/main/java/org/apache/hupa/server/ioc/ server/src/main/java/org/apache/hupa/server/preferences/ server/src/main/java/org/apache/hupa/server/servl
Author: manolo
Date: Sat Mar 15 10:36:25 2014
New Revision: 1577826
URL: http://svn.apache.org/r1577826
Log:
Do not remove non-hupa session attributes, so as hupa server can be included in
other backends, and some re-factoring to avoid repeated code
Modified:
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/preferences/InImapUserPreferencesStorage.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InSessionUserPreferencesStorage.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/UploadAttachmentServlet.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SessionUtils.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
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=1577826&r1=1577825&r2=1577826&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
Sat Mar 15 10:36:25 2014
@@ -127,87 +127,86 @@ import com.google.web.bindery.requestfac
*/
public class GuiceServerModule extends AbstractModule {
- Properties properties;
+Properties properties;
- public GuiceServerModule(Properties properties) {
- this.properties = properties;
- }
-
- @Override
- protected void configure() {
- System.err.println("GuiceServerModule configuring beans.");
-
- try {
- // Bind addresses and ports for imap and smtp
- Names.bindProperties(binder(), properties);
- } catch (Exception e) {
- throw new RuntimeException("Unable to to configure hupa
server,"
- + "\nmake sure that you have a valid
/etc/default/hupa file"
- + "\nor the web container has been started with
the appropriate parameter:"
- + "
-Dhupa.config.file=your_hupa_properties_file", e);
- }
- bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
-
bind(ServiceLayerDecorator.class).to(IocRfServiceDecorator.class);
- bind(IocRfServiceLocator.class);
-
- bind(MailHeader.class).to(MailHeaderImpl.class);
-
- bind(User.class).to(UserImpl.class);
-
bind(Settings.class).toProvider(DefaultUserSettingsProvider.class);
- bind(ImapFolder.class).to(ImapFolderImpl.class);
- bind(Tag.class).to(TagImpl.class);
- bind(MessageDetails.class).to(MessageDetailsImpl.class);
- bind(MessageAttachment.class).to(MessageAttachmentImpl.class);
- bind(SmtpMessage.class).to(SmtpMessageImpl.class);
-
- bind(GenericResult.class).to(GenericResultImpl.class);
-
bind(FetchMessagesAction.class).to(FetchMessagesActionImpl.class);
-
bind(FetchMessagesResult.class).to(FetchMessagesResultImpl.class);
- bind(CreateFolderAction.class).to(CreateFolderActionImpl.class);
- bind(DeleteFolderAction.class).to(DeleteFolderActionImpl.class);
- bind(RenameFolderAction.class).to(RenameFolderActionImpl.class);
-
bind(DeleteMessageAllAction.class).to(DeleteMessageAllActionImpl.class);
-
bind(DeleteMessageByUidAction.class).to(DeleteMessageByUidActionImpl.class);
-
bind(GetMessageDetailsAction.class).to(GetMessageDetailsActionImpl.class);
-
bind(GetMessageDetailsResult.class).to(GetMessageDetailsResultImpl.class);
- bind(SendMessageAction.class).to(SendMessageActionImpl.class);
-
bind(SendForwardMessageAction.class).to(SendForwardMessageActionImpl.class);
-
bind(SendReplyMessageAction.class).to(SendReplyMessageActionImpl.class);
-
bind(GetMessageRawAction.class).to(GetMessageRawActionImpl.class);
-
bind(GetMessageRawResult.class).to(GetMessageRawResultImpl.class);
- bind(LogoutUserAction.class).to(LogoutUserActionImpl.class);
-
svn commit: r1577822 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SettingsDiscoverer.java
Author: manolo
Date: Sat Mar 15 10:33:53 2014
New Revision: 1577822
URL: http://svn.apache.org/r1577822
Log:
Return an empty settings if email is nor valid
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SettingsDiscoverer.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SettingsDiscoverer.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SettingsDiscoverer.java?rev=1577822&r1=1577821&r2=1577822&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SettingsDiscoverer.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/SettingsDiscoverer.java
Sat Mar 15 10:33:53 2014
@@ -32,7 +32,13 @@ public class SettingsDiscoverer {
@Inject private Provider settingsProvider;
public Settings discoverSettings(String email) {
+
+if
(!email.matches("^(.*<)?[A-Za-z0-9._%'*/=+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$"))
{
+return new SettingsImpl();
+}
+
String domain = email.replaceFirst("^.*@", "");
+
Settings s = validConfigs.get(domain);
if (s != null) {
return s;
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1577821 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
Author: manolo
Date: Sat Mar 15 10:32:46 2014
New Revision: 1577821
URL: http://svn.apache.org/r1577821
Log:
Do not repeat contacts
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java?rev=1577821&r1=1577820&r2=1577821&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
Sat Mar 15 10:32:46 2014
@@ -32,8 +32,6 @@ import java.util.List;
*/
public abstract class UserPreferencesStorage {
-protected static final String CONTACTS_ATTR = "contacts";
-
protected static final String REGEX_OMITTED_EMAILS =
"^.*(reply)[A-z0-9._%\\+\\-]*@.*$";
/**
@@ -59,12 +57,26 @@ public abstract class UserPreferencesSto
final public void addContact(List mails) {
if (mails != null) {
for (String mail: mails) {
- if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
+if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
Contact contact = new Contact(mail);
-addContact(contact);
- }
+if (!exists(contact)) {
+addContact(contact);
+}
+}
+}
+}
+}
+
+boolean exists (Contact mail) {
+for (Contact c : getContacts()) {
+if (c.mail.equals(mail.mail)) {
+if (c.realname == null || c.realname.isEmpty() ||
c.realname.equals(c.mail)) {
+c.realname = mail.realname;
+}
+return true;
}
}
+return false;
}
/**
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1577820 - /james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Author: manolo
Date: Sat Mar 15 10:30:05 2014
New Revision: 1577820
URL: http://svn.apache.org/r1577820
Log:
add methods for getting the iso address from contacts
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1577820&r1=1577819&r2=1577820&view=diff
==
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Sat Mar 15 10:30:05 2014
@@ -27,60 +27,70 @@ import com.google.gwt.user.client.rpc.Is
public class ContactsResult{
- public static class Contact implements IsSerializable, Serializable{
+public static class Contact implements IsSerializable, Serializable{
private static final long serialVersionUID = -8632580327693416473L;
- public String mail;
- public String realname;
+public String mail;
+public String realname;
- public Contact() {
- }
+public Contact() {
+}
- public Contact(String address) {
- mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1");
+public Contact(String address) {
+mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1");
- realname = mail.equals(address) ? mail : address
- // remove the email part
- .replaceAll("<[^<>]+>\\s*$", "")
- // remove start symbols in the name
- .replaceAll("^[\\s\"'<]+", "")
- // remove end symbols in the name
- .replaceAll("[\\s\"'>]+$", "")
- ;
-
- if (realname.isEmpty())
- realname = mail;
- }
-
- public Contact(String realname, String mail) {
- this.realname = realname;
- this.mail = mail;
- }
-
- public String toString() {
- return (realname != null ? realname : "") + "<" + mail
+ ">";
- }
-
- public String toKey() {
- return toString().replaceAll("[^\\w\\d<@>]+",
"").toLowerCase();
- }
-
- }
-
- private Contact[] contacts;
-
- public ContactsResult() {
- }
-
- public ContactsResult(Contact... contacts) {
- this.contacts = contacts;
- }
-
- public Contact[] getContacts() {
- return contacts;
- }
-
- public void setContacts(Contact[] contacts) {
- this.contacts = contacts;
- }
+realname = mail.equals(address) ? mail : address
+// remove the email part
+.replaceAll("<[^<>]+>\\s*$", "")
+// remove start symbols in the name
+.replaceAll("^[\\s\"'<]+", "")
+// remove end symbols in the name
+.replaceAll("[\\s\"'>]+$", "")
+;
+
+if (realname.isEmpty())
+realname = mail;
+}
+
+public Contact(String realname, String mail) {
+this.realname = realname;
+this.mail = mail;
+}
+
+public String toString() {
+return realname != null && !realname.isEmpty() ? realname : mail;
+}
+
+public String toKey() {
+return toString().replaceAll("[^\\w\\d<@>]+", "").toLowerCase();
+}
+
+public String getName() {
+return realname;
+}
+
+public String toIsoAddress() {
+if (!mail.equals(realname))
+return realname + " <" + mail + ">";
+else
+return mail;
+}
+}
+
+private Contact[] contacts;
+
+public ContactsResult() {
+}
+
+public ContactsResult(Contact... contacts) {
+this.contacts = contacts;
+}
+
+public Contact[] getContacts() {
+return contacts;
+}
+
+public void setContacts(Contact[] contacts) {
+this.contacts = contacts;
+}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1577819 - in /james/hupa/trunk: mock/src/main/java/org/apache/hupa/server/mock/ mock/src/main/resources/mime/ server/ shared/src/main/webapp/
Author: manolo
Date: Sat Mar 15 10:26:38 2014
New Revision: 1577819
URL: http://svn.apache.org/r1577819
Log:
Remove ecs stuff
Removed:
james/hupa/trunk/mock/src/main/resources/mime/11.msg
james/hupa/trunk/mock/src/main/resources/mime/12.msg
james/hupa/trunk/mock/src/main/resources/mime/13.msg
james/hupa/trunk/shared/src/main/webapp/
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
james/hupa/trunk/server/pom.xml
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java?rev=1577819&r1=1577818&r2=1577819&view=diff
==
---
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
Sat Mar 15 10:26:38 2014
@@ -66,7 +66,6 @@ public class MockIMAPStore extends IMAPS
super(session, url);
if (url != null && MOCK_HOST.equals(url.getHost())) {
validLogins.put(MOCK_LOGIN, MOCK_LOGIN);
-validLogins.put("hupa4...@gmail.com", "HupaForEcs");
try {
new MockIMAPFolder(MOCK_INBOX_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
new MockIMAPFolder(MOCK_SENT_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
Modified: james/hupa/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1577819&r1=1577818&r2=1577819&view=diff
==
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Sat Mar 15 10:26:38 2014
@@ -80,12 +80,6 @@
commons-io
commons-io
-
-
-commons-codec
-commons-codec
-1.6
-
com.google.code.guice
guice
@@ -116,16 +110,6 @@
junit
test
-
-
- org.bouncycastle
- bcprov-ext-jdk14
- 1.49
-
commons-lang
commons-lang
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1573313 - in /james/hupa/trunk: ./ .gitignore hupa/ hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml pom.xml
Author: manolo Date: Sun Mar 2 14:33:04 2014 New Revision: 1573313 URL: http://svn.apache.org/r1573313 Log: Update to gwt version 2.6.0 Modified: james/hupa/trunk/ (props changed) james/hupa/trunk/.gitignore james/hupa/trunk/hupa/ (props changed) james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml james/hupa/trunk/pom.xml Propchange: james/hupa/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Mar 2 14:33:04 2014 @@ -1,7 +1,6 @@ target tomcat www-test -.gwt -.settings -bin -.project +.* +war +coverage.ec Modified: james/hupa/trunk/.gitignore URL: http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1573313&r1=1573312&r2=1573313&view=diff == --- james/hupa/trunk/.gitignore (original) +++ james/hupa/trunk/.gitignore Sun Mar 2 14:33:04 2014 @@ -1,49 +1,21 @@ .project -.settings/ -client/.classpath -client/.project -client/.settings/ -client/target/ -<<<<<<< HEAD -<<<<<<< HEAD -client/.gwt/ -=== ->>>>>>> add gitignore to ignore files by git -=== -client/.gwt/ ->>>>>>> update git ignore -mock/.classpath -mock/.project -mock/.settings/ -mock/target/ -server/.classpath -server/.project -server/.settings/ -server/target/ -server/war/ -shared/.classpath -shared/.project -shared/.settings/ -shared/target/ -target/ -widgets/.classpath -widgets/.project -widgets/.settings/ -widgets/target/ -<<<<<<< HEAD -<<<<<<< HEAD - -client/src/main/gwt-unitCache/ -client/src/main/webapp/WEB-INF/deploy/ -client/src/main/webapp/hupa/ -=== ->>>>>>> add gitignore to ignore files by git -=== - -<<<<<<< HEAD ->>>>>>> update git ignore -=== -client/src/main/gwt-unitCache/ -client/src/main/webapp/WEB-INF/deploy/ -client/src/main/webapp/hupa/ ->>>>>>> layout the label setting view +.settings +.classpath +.gwt +gwt-unitCache +webapp/WEB-INF/deploy +webapp/hupa +target +war +www-test +*~ +*diff +*.tar +*.log +tmp +._* +build +DS_Store +*.swp +.factorypath +.DS_Store Propchange: james/hupa/trunk/hupa/ -- --- svn:ignore (added) +++ svn:ignore Sun Mar 2 14:33:04 2014 @@ -0,0 +1,6 @@ +target +tomcat +www-test +.* +war +coverage.ec Modified: james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1573313&r1=1573312&r2=1573313&view=diff == --- james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml (original) +++ james/hupa/trunk/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml Sun Mar 2 14:33:04 2014 @@ -29,7 +29,7 @@ - + Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1573313&r1=1573312&r2=1573313&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Sun Mar 2 14:33:04 2014 @@ -57,8 +57,8 @@ -2.5.1 -2.5.1 +2.6.0 +2.6.0 INFO 7.3.0.v20110203 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1573312 - in /james/hupa/trunk: README README.txt
Author: manolo
Date: Sun Mar 2 14:19:39 2014
New Revision: 1573312
URL: http://svn.apache.org/r1573312
Log:
update README
Removed:
james/hupa/trunk/README
Modified:
james/hupa/trunk/README.txt
Modified: james/hupa/trunk/README.txt
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/README.txt?rev=1573312&r1=1573311&r2=1573312&view=diff
==
--- james/hupa/trunk/README.txt (original)
+++ james/hupa/trunk/README.txt Sun Mar 2 14:19:39 2014
@@ -1,3 +1,12 @@
+
+## Introduction ##
+Hupa is an Rich IMAP-based Webmail application written in GWT.
+
+Hupa has been entirely written in java to be coherent with the language used
in the James project.
+It has been a development reference using GWT good practices (MVP pattern and
Unit testing)
+
+It is ready for reading, sending, and managing messages and folders, but it
still lacks of many features email clients nowadays have.
+
## Bulding ##
Hupa use maven2 as build tool. To build hupa download maven2
(http://maven.apache.org), unpack maven2 and install it.
After that change to hupa directory and execute the following cmd:
@@ -5,7 +14,7 @@ $ mvn clean package
## Configuring server side
Hupa uses a properties file to know the IMAP and SMTP servers configuration.
-There is an example configuration file in
'server/src/main/webapp/WEB-INF/conf/config.properties'
+There is an example configuration file in
'hupa/src/main/webapp/WEB-INF/conf/config.properties'
- You can set your configuration parameters in either of these files:
$HOME/.hupa/config.properties
@@ -22,36 +31,18 @@ http://localhost:8282
If you prefer to use any other servlet container you can deploy the provided
.war file in it.
-## Hupa and GMail #
-By default hupa is configurated as a gmail imap/smtp client, use any gmail
valid account to login.
-NOTE: that previously to use a gmail account via imap you should enable imap
in your gmail account.
-
-## Demo Mode #
-In demo mode it is not necessary any imap or smtp server.
-A bunch of example messages and folders are shown to the user to be
manipulated.
-Almost every hupa feature work in demo mode.
-
-To enable demo mode set 'IMAPServerAddress=hupa.demo' or start your servlet
container with the
-parameter 'hupa.demo'
-
-$ java -Dhupa.demo -jar target/hupa-${version}.war
+## Hupa and IMAP/SMTP servers #
+Hupa is able to discover most of the imap/smtp configuration based on the
email domain part.
+When you are prompted to login, type your email address and wait few seconds,
if you click on the
+gear button you can see the configuration discovered by Hupa, you can modify
it if it does not match
+your email provider configuration. Then type your inbox password and you will
be logged into your
+email provider servers.
-To login into the system in this mode use the user 'demo' with password 'demo'
+Hupa is compatible with most email providers, gmail, yahoo, hotmail, outlook,
exchange, james, etc.
## Eclipse GWT Plugin notes
- Hupa uses maven to be built, before inporting the project, you shoul install
m2eclipse
and google plugins, then go to Import -> New maven project and select the
modules:
-shared, mock, server, widget and client.
+shared, mock, server, widgets, client and hupa.
- To run hupa in hosted mode, select: Run as -> (Google) Web application.
- * May be you need to specify the appropriate hupa configuration file if you
do not want to
-run it in demo mode.
-If you don't have a suitable file in $HOME/.hupa or /etc/default/hupa you
have to add the
-following line to the "vm argument" in the Run configuration:
-
-Dhupa.config.file=folder_to_hupa_dources/server/src/main/webapp/WEB-INF/conf/config.properties
-
-- If you compile hupa with google's eclipse plugin and you get the message:
- >> 'GWT module hupa needs to be (re)compiled, please run a compile or use
the Compile/Browse button in hosted mode'
-
- Configure the plugin to compile only the 'Hupa' module.
- Properties -> Google -> Web Toolkit -> Entry Point Modules -> Hupa -
org.apache.hupa
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1573311 - /james/hupa/trunk/hupa/pom.xml
Author: manolo
Date: Sun Mar 2 14:07:59 2014
New Revision: 1573311
URL: http://svn.apache.org/r1573311
Log:
forget file
Added:
james/hupa/trunk/hupa/pom.xml
Added: james/hupa/trunk/hupa/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/hupa/pom.xml?rev=1573311&view=auto
==
--- james/hupa/trunk/hupa/pom.xml (added)
+++ james/hupa/trunk/hupa/pom.xml Sun Mar 2 14:07:59 2014
@@ -0,0 +1,309 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.james.hupa
+hupa-parent
+0.0.5-SNAPSHOT
+../pom.xml
+
+hupa
+war
+Apache James Hupa
+A GWT based IMAP webmail
+
+Prod
+org.apache.hupa.Hupa${gwt.module.suffix}
+src/main/webapp/WEB-INF/web.xml
+INFO
+
+
+
+
+
+${project.groupId}
+hupa-client
+
+
+com.google.gwt
+gwt-user
+
+
+javax.validation
+validation-api
+
+
+
+
+com.google.gwt
+gwt-dev
+
+
+${project.groupId}
+hupa-server
+
+
+${project.groupId}
+hupa-mock
+
+
+${project.groupId}
+hupa-server
+${project.version}
+test-jar
+test
+
+
+${project.groupId}
+hupa-shared
+
+
+${project.groupId}
+hupa-widgets
+
+
+org.cobogw.gwt
+cobogw
+
+
+com.google.code.gwt-dnd
+gwt-dnd
+
+
+eu.maydu.gwt
+gwt-vl
+
+
+com.googlecode.gwtupload
+gwtupload
+
+
+com.google.gwt.inject
+gin
+
+
+com.googlecode.gwtquery
+gwtquery
+
+
+javax.validation
+validation-api
+
+
+ javax.validation
+ validation-api
+ sources
+
+
+org.hibernate
+hibernate-validator
+4.2.0.Final
+
+
+org.json
+json
+
+
+junit
+junit
+
+
+org.easymock
+easymock
+
+
+org.slf4j
+slf4j-log4j12
+
+
+org.eclipse.jetty
+jetty-server
+
+
+org.eclipse.jetty
+jetty-webapp
+
+
+
+
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
+
+
+org.codehaus.mojo
+gwt-maven-plugin
+
+Hupa.html
+1
+${gwt.compileReport}
+
+-Xmx512M -Xss128M
+
+1
+${gwt.compileReport}
+
${gwt.disableClassMetadata}
+
${gwt.disableCastChecking}
+${gwt.logLevel}
+${gwt.style}
+10
+
${gwt.enableClosureCompiler}
+${gwt.disableRunAsync}
+
${basedir}/src/main/webapp
+
${project.build.directory}
+
+
+gwt.modules
+
+-XX:MaxPermSize=512M -Xmx1024M
+
+
+
+prepare-package
+
+compile
+
+
+
+
+
+org.apache.maven.plugins
+maven-war-plugin
+
+true
+${web.xml}
+${project.artifactId}-${project.version}
+
+
+org.apache.hupa.Launcher
+
+
+
+
+
+org.apache.maven.plugins
+maven-eclipse-plugin
+
+true
+false
+2.0
+
+
+
com.google.gwt.
svn commit: r1526135 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/gin/ client/
Author: manolo Date: Wed Sep 25 08:19:23 2013 New Revision: 1526135 URL: http://svn.apache.org/r1526135 Log: Remove unused source files Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingEcsPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingEcsPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingLabelPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingLabelPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java james/hupa/trunk/server/src/main/java/com/chiaramail/hupa/helper/Account.java james/hupa/trunk/server/src/main/java/com/chiaramail/hupa/helper/Utility.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java james/hupa/trunk/server/src/test/java/com/chiaramail/hupa/helper/EcsUtilityTest.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java james/hupa/trunk/server/src/test
svn commit: r1526134 - /james/hupa/trunk/src/site/xdoc/index.xml
Author: manolo
Date: Wed Sep 25 08:18:21 2013
New Revision: 1526134
URL: http://svn.apache.org/r1526134
Log:
Fix hupa doc
Modified:
james/hupa/trunk/src/site/xdoc/index.xml
Modified: james/hupa/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1526134&r1=1526133&r2=1526134&view=diff
==
--- james/hupa/trunk/src/site/xdoc/index.xml (original)
+++ james/hupa/trunk/src/site/xdoc/index.xml Wed Sep 25 08:18:21 2013
@@ -26,64 +26,20 @@
language used in the James project. And It has
been a reference of a
devloping using GWT good practices (MVP pattern
and Unit testing)
Hupa is a functional and well designed email
client, ready for
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
reading, sending and managing messages, but it
still lacks of many features
email clients nowadays have.
-===
- reading, sending and managing messages, but it
lacks of many features
- email clients nowadays have like address book
->>>>>>> first commit
-===
- reading, sending and managing messages, but it
still lacks of many features
- email clients nowadays have.
->>>>>>> constantly changed by manolo
-===
- reading, sending and managing messages, but it
lacks of many features
- email clients nowadays have like address book
->>>>>>> first commit
-===
- reading, sending and managing messages, but it
still lacks of many features
- email clients nowadays have.
->>>>>>> constantly changed by manolo
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-===
->>>>>>> constantly changed by manolo
-===
->>>>>>> constantly changed by manolo
-Last release is Hupa 0.0.2:
-
binary : ready to run or to deploy in any servlet container.
-
sources .
+Last release is Hupa 0.0.3:
+
binary : ready to run or to deploy in any servlet container.
+
sources .
Current trunk:
-
+
0.3-SNAPSHOT
-<<<<<<< HEAD
-<<<<<<< HEAD
-===
-Although there isn't a stable release yet you can download the
latest
-
- 0.2-SNAPSHOT
->>>>>>> first commit
-===
->>>>>>> constantly changed by manolo
-===
-Although there isn't a stable release yet you can download the
latest
-
- 0.2-SNAPSHOT
->>>>>>> first commit
-===
->>>>>>> constantly changed by manolo
from our continuous integration server.
@@ -99,55 +55,15 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-===
->>>>>>> constantly changed by manolo
-===
->>>>>>> constantly changed by manolo
Jun/2012 - Hupa 0.2 released
First stable version.
-<<<<<<< HEAD
-<<<<<<< HEAD
-Apr/2012 - Hupa evolution accepted
-
-We have got a http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1";
-target="_blank">GSOC student who will work with
Hupa this Summer
-making it better !.
-===
-===
->>>>>>> constantly changed by manolo
-Apr/2012 - Hupa evolution accepted
-
-<<<<<<< HEAD
-Whe have got a GSOC student who will work with Hupa this
Summer
-http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1";
-target="_blank">making it better.
->>>>>>> first commit
-===
-We have got a http://www.google-melange.com/gsoc/prop
svn commit: r1525515 [13/13] - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/
more contributor license agreements. See the NOTICE file *
@@ -32,50 +27,3 @@ public class InvalidSessionException ext
super(message);
}
}
-<<<<<<< HEAD
-===
-===
->>>>>>> first commit
-/
- * 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.shared.exception;
-
-import net.customware.gwt.dispatch.shared.ActionException;
-
-/**
- *
- */
-public class InvalidSessionException extends ActionException{
-
-/**
- *
- */
-private static final long serialVersionUID = 995112620968798947L;
-
-public InvalidSessionException(String msg) {
-super(msg);
-}
-}
-<<<<<<< HEAD
->>>>>>> first commit
-===
->>>>>>> first commit
-===
->>>>>>> re-add server unit tests
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1525515&r1=1525514&r2=1525515&view=diff
======
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Mon Sep 23 07:04:08 2013
@@ -24,12 +24,6 @@ import java.io.Serializable;
import com.google.gwt.user.client.rpc.IsSerializable;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-
public class ContactsResult{
@@ -88,164 +82,5 @@ public class ContactsResult{
public void setContacts(Contact[] contacts) {
this.contacts = contacts;
}
-===
-===
->>>>>>> first commit
-import net.customware.gwt.dispatch.shared.Result;
-===
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
license headers to all new files
-
-public class ContactsResult{
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-===
->>>>>>> first commit
-public static class Contact implements Result, Serializable {
-private static final long serialVersionUID = -8632580327693416473L;
-public String mail;
-public String realname;
-
-public Contact() {
-}
-
-public Contact(String mail){
-this.realname = !mail.contains("<") ? "" :
- mail.replaceAll("<.+$", "")
- .replaceAll("^[\\s\"']+","")
- .replaceAll("[\\s\"']+$", "");
-this.mail = mail.replaceAll("^.*<([^>]+)>","$1");
-}
-
-public Contact(String realname, String mail) {
-this.realname = realname;
-this.mail = mail;
-}
-
-public String toString() {
-return (realname != null ? realname : "") + "<" + mail + ">";
-}
-
-public String toKey() {
-return toString().replaceAll("[^\\w\\d<@>]+", "").toLowerCase();
-}
-
-}
-
-private static final long serialVersionUID = -8740775403377441876L;
-private Contact[] contacts;
-
-public ContactsResult() {
-}
-
-public ContactsResult(Contact... contacts) {
-
svn commit: r1375909 - /james/hupa/trunk/src/site/xdoc/index.xml
Author: manolo Date: Wed Aug 22 07:20:32 2012 New Revision: 1375909 URL: http://svn.apache.org/viewvc?rev=1375909&view=rev Log: Update release section in hupa doc Modified: james/hupa/trunk/src/site/xdoc/index.xml Modified: james/hupa/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1375909&r1=1375908&r2=1375909&view=diff == --- james/hupa/trunk/src/site/xdoc/index.xml (original) +++ james/hupa/trunk/src/site/xdoc/index.xml Wed Aug 22 07:20:32 2012 @@ -32,14 +32,14 @@ -Last release is Hupa 0.0.2: - binary : ready to run or to deploy in any servlet container. - sources . +Last release is Hupa 0.0.3: + binary : ready to run or to deploy in any servlet container. + sources . Current trunk: - - 0.3-SNAPSHOT + + 0.4-SNAPSHOT from our continuous integration server. - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1373774 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaCallback.java mvp/IMAPMessageListView.java
Author: manolo
Date: Thu Aug 16 10:06:12 2012
New Revision: 1373774
URL: http://svn.apache.org/viewvc?rev=1373774&view=rev
Log:
remove println
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java?rev=1373774&r1=1373773&r2=1373774&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
Thu Aug 16 10:06:12 2012
@@ -117,6 +117,5 @@ public abstract class HupaCallback im
*/
public void callbackError(Throwable caught) {
System.out.println("HupaCallBack Error: " + caught);
-caught.printStackTrace();
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=1373774&r1=1373773&r2=1373774&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
Thu Aug 16 10:06:12 2012
@@ -791,7 +791,6 @@ public class IMAPMessageListView extends
}
public void setExpandLoading(boolean expanding) {
-System.out.println("SSS " + expanding);
if (expanding) {
loading.show();
} else {
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1373768 - in /james/hupa/trunk: client/pom.xml mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml
Author: manolo Date: Thu Aug 16 09:32:01 2012 New Revision: 1373768 URL: http://svn.apache.org/viewvc?rev=1373768&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: james/hupa/trunk/client/pom.xml james/hupa/trunk/mock/pom.xml james/hupa/trunk/pom.xml james/hupa/trunk/server/pom.xml james/hupa/trunk/shared/pom.xml james/hupa/trunk/widgets/pom.xml Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1373768&r1=1373767&r2=1373768&view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Thu Aug 16 09:32:01 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3 +0.0.4-SNAPSHOT ../pom.xml hupa Modified: james/hupa/trunk/mock/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1373768&r1=1373767&r2=1373768&view=diff == --- james/hupa/trunk/mock/pom.xml (original) +++ james/hupa/trunk/mock/pom.xml Thu Aug 16 09:32:01 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3 +0.0.4-SNAPSHOT ../pom.xml hupa-mock Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1373768&r1=1373767&r2=1373768&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Thu Aug 16 09:32:01 2012 @@ -27,7 +27,7 @@ org.apache.james.hupa hupa-parent -0.0.3 +0.0.4-SNAPSHOT pom Apache James Hupa Parent Hupa is a GWT based Webmail @@ -41,9 +41,9 @@ client - scm:svn:http://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.3 - scm:svn:https://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.3 - http://svn.apache.org/viewvc/james/hupa/tags/hupa-parent-0.0.3 + scm:svn:http://svn.apache.org/repos/asf/james/hupa/trunk + scm:svn:https://svn.apache.org/repos/asf/james/hupa/trunk +http://svn.apache.org/viewvc/james/hupa/trunk/ JIRA Modified: james/hupa/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1373768&r1=1373767&r2=1373768&view=diff == --- james/hupa/trunk/server/pom.xml (original) +++ james/hupa/trunk/server/pom.xml Thu Aug 16 09:32:01 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3 +0.0.4-SNAPSHOT ../pom.xml hupa-server Modified: james/hupa/trunk/shared/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1373768&r1=1373767&r2=1373768&view=diff == --- james/hupa/trunk/shared/pom.xml (original) +++ james/hupa/trunk/shared/pom.xml Thu Aug 16 09:32:01 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3 +0.0.4-SNAPSHOT ../pom.xml hupa-shared Modified: james/hupa/trunk/widgets/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1373768&r1=1373767&r2=1373768&view=diff == --- james/hupa/trunk/widgets/pom.xml (original) +++ james/hupa/trunk/widgets/pom.xml Thu Aug 16 09:32:01 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3 +0.0.4-SNAPSHOT ../pom.xml hupa-widgets - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1373767 - /james/hupa/tags/hupa-parent-0.0.3/
Author: manolo Date: Thu Aug 16 09:31:55 2012 New Revision: 1373767 URL: http://svn.apache.org/viewvc?rev=1373767&view=rev Log: [maven-release-plugin] copy for tag hupa-parent-0.0.3 Added: james/hupa/tags/hupa-parent-0.0.3/ - copied from r1373766, james/hupa/trunk/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1373766 - in /james/hupa/trunk: client/pom.xml mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml
Author: manolo Date: Thu Aug 16 09:31:44 2012 New Revision: 1373766 URL: http://svn.apache.org/viewvc?rev=1373766&view=rev Log: [maven-release-plugin] prepare release hupa-parent-0.0.3 Modified: james/hupa/trunk/client/pom.xml james/hupa/trunk/mock/pom.xml james/hupa/trunk/pom.xml james/hupa/trunk/server/pom.xml james/hupa/trunk/shared/pom.xml james/hupa/trunk/widgets/pom.xml Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1373766&r1=1373765&r2=1373766&view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Thu Aug 16 09:31:44 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3-SNAPSHOT +0.0.3 ../pom.xml hupa Modified: james/hupa/trunk/mock/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1373766&r1=1373765&r2=1373766&view=diff == --- james/hupa/trunk/mock/pom.xml (original) +++ james/hupa/trunk/mock/pom.xml Thu Aug 16 09:31:44 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3-SNAPSHOT +0.0.3 ../pom.xml hupa-mock Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1373766&r1=1373765&r2=1373766&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Thu Aug 16 09:31:44 2012 @@ -27,7 +27,7 @@ org.apache.james.hupa hupa-parent -0.0.3-SNAPSHOT +0.0.3 pom Apache James Hupa Parent Hupa is a GWT based Webmail @@ -41,9 +41,9 @@ client - scm:svn:http://svn.apache.org/repos/asf/james/hupa/trunk - scm:svn:https://svn.apache.org/repos/asf/james/hupa/trunk -http://svn.apache.org/viewvc/james/hupa/trunk/ + scm:svn:http://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.3 + scm:svn:https://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.3 + http://svn.apache.org/viewvc/james/hupa/tags/hupa-parent-0.0.3 JIRA Modified: james/hupa/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1373766&r1=1373765&r2=1373766&view=diff == --- james/hupa/trunk/server/pom.xml (original) +++ james/hupa/trunk/server/pom.xml Thu Aug 16 09:31:44 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3-SNAPSHOT +0.0.3 ../pom.xml hupa-server Modified: james/hupa/trunk/shared/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1373766&r1=1373765&r2=1373766&view=diff == --- james/hupa/trunk/shared/pom.xml (original) +++ james/hupa/trunk/shared/pom.xml Thu Aug 16 09:31:44 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3-SNAPSHOT +0.0.3 ../pom.xml hupa-shared Modified: james/hupa/trunk/widgets/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1373766&r1=1373765&r2=1373766&view=diff == --- james/hupa/trunk/widgets/pom.xml (original) +++ james/hupa/trunk/widgets/pom.xml Thu Aug 16 09:31:44 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.3-SNAPSHOT +0.0.3 ../pom.xml hupa-widgets - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1373762 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/mvp/ server/src/main/java/org/apache/hupa/server/handler/ server/s
Author: manolo
Date: Thu Aug 16 09:15:19 2012
New Revision: 1373762
URL: http://svn.apache.org/viewvc?rev=1373762&view=rev
Log:
Fix XSS vulnerability in message list and view
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java?rev=1373762&r1=1373761&r2=1373762&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
Thu Aug 16 09:15:19 2012
@@ -117,5 +117,6 @@ public abstract class HupaCallback im
*/
public void callbackError(Throwable caught) {
System.out.println("HupaCallBack Error: " + caught);
+caught.printStackTrace();
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=1373762&r1=1373761&r2=1373762&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
Thu Aug 16 09:15:19 2012
@@ -363,7 +363,7 @@ public class IMAPMessageListView extends
dtformat = DateTimeFormat.getFormat("dd.MMM. HH:mm");
}
-view.setHTML(dtformat.format(rDate));
+view.setText(dtformat.format(rDate));
view.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT);
}
@@ -528,7 +528,7 @@ public class IMAPMessageListView extends
if (cellValue == null || cellValue.length() < 1) {
view.setHTML("Â ");
} else {
-view.setHTML(cellValue);
+view.setText(cellValue);
}
}
@@ -791,6 +791,7 @@ public class IMAPMessageListView extends
}
public void setExpandLoading(boolean expanding) {
+System.out.println("SSS " + expanding);
if (expanding) {
loading.show();
} else {
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java?rev=1373762&r1=1373761&r2=1373762&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
Thu Aug 16 09:15:19 2012
@@ -137,8 +137,6 @@ public class GetMessageDetailsHandler ex
boolean isHTML = handleParts(message, con, sbPlain, attachmentList);
-System.out.println(isHTML);
-
if (isHTML) {
mDetails.setText(filterHtmlDocument(sbPlain.toString(),
folderName, uid));
} else {
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java?rev=1373762&r1=1373761&r2=1373762&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
Thu Aug 16 09:15:19 2012
@@ -60,9 +60,9 @@ public class RegexPatterns {
public static final Pattern regex_unneededTags =
Pattern.compile("(?si)(]*?>)");
public static final String repl_unneededTags = "";
-
-public static final String EVENT_ATTR_REGEX =
"(?:on[dbl]*click)|(?:onmouse[a-z]+)|(?:onkey[a-z]+)";
-public static final Pattern regex_badAttrs =
Pattern.compile("(?si)(<\\w+[^<>]*)\\s+("+ EVENT_ATTR_RE
svn commit: r1364950 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/mvp/ server/src/main/java/org/apache/hupa/server/handler/ shared/src/main/java/org/apache/hupa/shared/ shared/s
Author: manolo
Date: Tue Jul 24 09:09:40 2012
New Revision: 1364950
URL: http://svn.apache.org/viewvc?rev=1364950&view=rev
Log:
Fixes HUPA-96 : pass reference ids when replying. Patch by Zsombor Gegesy
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageDetails.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=1364950&r1=1364949&r2=1364950&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
Tue Jul 24 09:09:40 2012
@@ -41,6 +41,7 @@ import net.customware.gwt.presenter.clie
import org.apache.hupa.client.HupaCallback;
import org.apache.hupa.client.validation.EmailListValidator;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.Util;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
@@ -81,7 +82,6 @@ public class MessageSendPresenter extend
protected SMTPMessage message = null;
-@SuppressWarnings("unused")
private MessageDetails oldDetails;
private OnFinishUploaderHandler onFinishUploadHandler = new
OnFinishUploaderHandler() {
@@ -210,13 +210,29 @@ public class MessageSendPresenter extend
if (type == Type.NEW) {
command = new SendMessage(message);
} else if (type == Type.FORWARD) {
-command = new ForwardMessage(message, folder,
oldmessage.getUid());
+command = addMessageIds(new ForwardMessage(message,
folder, oldDetails.getUid()));
} else {
-command = new ReplyMessage(message, folder,
oldmessage.getUid());
+command = addMessageIds(new ReplyMessage(message, folder,
oldDetails.getUid()));
}
dispatchMessage(dispatcher, eventBus, command);
}
}
+
+private ForwardMessage addMessageIds(ForwardMessage msg) {
+String msgId = oldDetails.getMessageId();
+msg.setInReplyTo(msgId);
+
+if (msgId != null) {
+String oldRefs = oldDetails.getReferences();
+if (oldRefs != null) {
+msg.setReferences(msgId.trim() +
SConsts.HEADER_REFERENCES_SEPARATOR + oldRefs);
+} else {
+msg.setReferences(msgId.trim());
+}
+}
+return msg;
+}
+
};
protected ArrayList emailTextToArray(String emails) {
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java?rev=1364950&r1=1364949&r2=1364950&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
Tue Jul 24 09:09:40 2012
@@ -56,6 +56,7 @@ import org.apache.hupa.server.preference
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.server.utils.RegexPatterns;
import org.apache.hupa.server.utils.SessionUtils;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.data.User;
@@ -148,10 +149,29 @@ public abstract class AbstractSendMessag
message.setRecipients(RecipientType.CC,
MessageUtils.getRecipients(m.getCc()));
message.setRecipients(RecipientType.BCC,
MessageUtils.getRecipients(m.getBcc()));
message.setSubject(MessageUtils.encodeTexts(m.getSubject()));
+updateHeaders(message, action);
message.
svn commit: r1362375 - in /james/hupa/trunk/server/src: main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.
Author: manolo
Date: Tue Jul 17 06:27:39 2012
New Revision: 1362375
URL: http://svn.apache.org/viewvc?rev=1362375&view=rev
Log:
FIXES HUPA-94, patch by: Zsombor Gegesy
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java?rev=1362375&r1=1362374&r2=1362375&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
Tue Jul 17 06:27:39 2012
@@ -321,11 +321,11 @@ public abstract class AbstractSendMessag
}
if (text != null) {
txtPart = new MimeBodyPart();
-txtPart.setContent(text, "text/plain");
+txtPart.setContent(text, "text/plain; charset=UTF-8");
}
if (html != null) {
htmlPart = new MimeBodyPart();
-htmlPart.setContent(html, "text/html");
+htmlPart.setContent(html, "text/html; charset=UTF-8");
}
if (html != null && text != null) {
mimeMultipart = new MimeMultipart();
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java?rev=1362375&r1=1362374&r2=1362375&view=diff
==
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java
Tue Jul 17 06:27:39 2012
@@ -20,8 +20,16 @@
package org.apache.hupa.server.handler;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import javax.mail.BodyPart;
import javax.mail.Message;
+import javax.mail.MessagingException;
import javax.mail.Part;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.mock.MockIMAPFolder;
@@ -81,6 +89,24 @@ public class AbtractSendMessageHandlerTe
assertEquals(exp, TestUtils.summaryzeContent(msg).toString());
}
+public void testEncoding() throws MessagingException, IOException {
+String txt = " \u00e1rv\u00edzt\u0171r\u0151
t\u00fck\u00f6rf\u00far\u00f3 \u00c1RV\u00cdZT\u0170R\u0150
T\u00dcK\u00d6RF\u00daR\u00d3";
+String html = "\u00e1rv\u00edzt\u0171r\u0151
t\u00fck\u00f6rf\u00far\u00f3 \u00c1RV\u00cdZT\u0170R\u0150
T\u00dcK\u00d6RF\u00daR\u00d3";
+Message msg = TestUtils.createMockMimeMessage(session, txt, html, 0);
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+msg.writeTo(baos);
+
+MimeMessage input = new MimeMessage(null, new
ByteArrayInputStream(baos.toByteArray()));
+MimeMultipart content = (MimeMultipart) input.getContent();
+BodyPart bodyPart0 = content.getBodyPart(0);
+Object content0 = bodyPart0.getContent();
+BodyPart bodyPart1 = content.getBodyPart(1);
+Object content1 = bodyPart1.getContent();
+
+assertEquals(txt, content0);
+assertEquals(html, content1);
+}
+
public void testRestoreInlineLinks() {
String txt, res;
txt = ".. ..";
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1361533 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/mvp/ client/src/main/webapp/ server/src/main/java/org/apache/hupa/server/servlet/ shared/src/main/java/org/apac
Author: manolo
Date: Sat Jul 14 12:31:20 2012
New Revision: 1361533
URL: http://svn.apache.org/viewvc?rev=1361533&view=rev
Log:
FIXES HUPA-93, patch by: Zsombor Gegesy
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java?rev=1361533&r1=1361532&r2=1361533&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
Sat Jul 14 12:31:20 2012
@@ -41,6 +41,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
@@ -147,10 +148,7 @@ public class IMAPMessageView extends Com
link.setStyleName(HupaCSS.C_hyperlink);
link.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
-String url = GWT.getModuleBaseURL() +
SConsts.SERVLET_DOWNLOAD
-+ "?" + SConsts.PARAM_NAME + "=" +
messageAttachment.getName()
-+ "&" + SConsts.PARAM_FOLDER + "=" + folder
-+ "&" + SConsts.PARAM_UID + "=" + uid;
+String url = getUrl(messageAttachment, folder, uid,
false);
if (downloadIframe == null)
Window.open(url,"_blank", "");
else
@@ -161,10 +159,23 @@ public class IMAPMessageView extends Com
aPanel.addStyleName(HupaCSS.C_attachment);
aPanel.add(new Image(imageBundle.attachmentIcon()));
aPanel.add(link);
+if (messageAttachment.isImage()) {
+ Anchor viewImageLink = new
Anchor("View",getUrl(messageAttachment, folder, uid, true), "_blank");
+ viewImageLink.setStyleName(HupaCSS.C_attachment_view);
+ aPanel.add(viewImageLink);
+}
attachments.add(aPanel);
}
}
}
+
+private String getUrl(MessageAttachment messageAttachment, String folder,
long uid, boolean inline) {
+return GWT.getModuleBaseURL() + SConsts.SERVLET_DOWNLOAD
++ "?" + SConsts.PARAM_NAME + "=" + messageAttachment.getName()
++ "&" + SConsts.PARAM_FOLDER + "=" + folder
++ "&" + SConsts.PARAM_UID + "=" + uid
++ (inline ? "&" + SConsts.PARAM_MODE + "=inline" : "");
+}
public HasClickHandlers getForwardButtonClick() {
return forwardMsgButton;
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1361533&r1=1361532&r2=1361533&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Sat Jul 14 12:31:20 2012
@@ -287,6 +287,10 @@ div.hupa-msgview-content {
cursor: pointer;
}
+.hupa-attachment-view {
+ margin-left: 10px;
+}
+
/[ view: MessageSendView ]***/
table.hupa-msgsend {
width: 100%;
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=1361533&r1=1361532&r2=1361533&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
(or
svn commit: r1361503 - in /james/hupa/trunk/client/src: main/java/org/apache/hupa/client/validation/EmailListValidator.java test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
Author: manolo
Date: Sat Jul 14 09:43:29 2012
New Revision: 1361503
URL: http://svn.apache.org/viewvc?rev=1361503&view=rev
Log:
FIXES HUPA-94, patch by: Zsombor Gegesy
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java?rev=1361503&r1=1361502&r2=1361503&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
Sat Jul 14 09:43:29 2012
@@ -19,6 +19,7 @@
package org.apache.hupa.client.validation;
+import com.google.gwt.regexp.shared.RegExp;
import com.google.gwt.user.client.ui.HasText;
import eu.maydu.gwt.validation.client.ValidationAction;
@@ -33,7 +34,7 @@ import eu.maydu.gwt.validation.client.i1
*
*/
public class EmailListValidator extends Validator{
-private static final String emailRegex =
"^(.*<)?[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
+private static final String emailRegex =
"^(.*<)?[A-Za-z0-9._%'*/=+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
private HasText text;
public EmailListValidator(HasText text) {
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java?rev=1361503&r1=1361502&r2=1361503&view=diff
==
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
Sat Jul 14 09:43:29 2012
@@ -31,6 +31,7 @@ public class EmailListValidatorTest exte
assertFalse(EmailListValidator.isValidAddressList("a...@abc.def ; ;
MMM ;;;"));
assertTrue(EmailListValidator.isValidAddressList("a...@abc.def ; ; MMM
;;;"));
assertTrue(EmailListValidator.isValidAddressList("a...@abc.def\nMMM
;;;"));
+
assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail@james.apache.org"));
}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1361501 - /james/hupa/trunk/pom.xml
Author: manolo Date: Sat Jul 14 09:41:44 2012 New Revision: 1361501 URL: http://svn.apache.org/viewvc?rev=1361501&view=rev Log: add profile for readable js Modified: james/hupa/trunk/pom.xml Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1361501&r1=1361500&r2=1361501&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Sat Jul 14 09:41:44 2012 @@ -82,6 +82,16 @@ + + +pretty + + Prod + PRETTY + + TRACE + + - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1361500 - in /james/hupa/trunk/client: pom.xml src/main/webapp/Hupa.css src/main/webapp/Hupa.html
Author: manolo
Date: Sat Jul 14 09:40:21 2012
New Revision: 1361500
URL: http://svn.apache.org/viewvc?rev=1361500&view=rev
Log:
Enable chromeframe in IE6/7/8 when available
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1361500&r1=1361499&r2=1361500&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Sat Jul 14 09:40:21 2012
@@ -144,6 +144,7 @@
${gwt.disableClassMetadata}
${gwt.disableCastChecking}
${gwt.logLevel}
+${gwt.style}
org.apache.hupa.Hupa${gwt.moduleSuffix}
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1361500&r1=1361499&r2=1361500&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Sat Jul 14 09:40:21 2012
@@ -164,8 +164,8 @@ div.hupa-bottom {
/[ view: LoginView ]***/
table.hupa-login {
text-align: right;
-margin-left: -125px;
-position: absolute;
+margin-left: -220px;
+position: relative;
left: 50%;
padding: 40px;
}
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1361500&r1=1361499&r2=1361500&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Sat Jul 14 09:40:21 2012
@@ -18,6 +18,9 @@
+
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1361492 - /james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorImplIE.java
Author: manolo Date: Sat Jul 14 08:08:00 2012 New Revision: 1361492 URL: http://svn.apache.org/viewvc?rev=1361492&view=rev Log: Remove unused file Removed: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorImplIE.java - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1361484 - in /james/hupa/trunk: client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/mvp/ client/src/main
Author: manolo Date: Sat Jul 14 07:39:51 2012 New Revision: 1361484 URL: http://svn.apache.org/viewvc?rev=1361484&view=rev Log: Remove dependency of org.cobogw.gwt for Round panels. Use css3 in modern browsers and gwt decorators for old ones Added: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorCss3.java james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorDecorator.java Removed: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorImpl.java Modified: james/hupa/trunk/client/pom.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java james/hupa/trunk/client/src/main/webapp/Hupa.css james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1361484&r1=1361483&r2=1361484&view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Sat Jul 14 07:39:51 2012 @@ -93,6 +93,11 @@ validation-api provided + + javax.validation + validation-api + sources + org.hibernate hibernate-validator Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1361484&r1=1361483&r2=1361484&view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Sat Jul 14 07:39:51 2012 @@ -38,9 +38,10 @@ - - - + + + + Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java?rev=1361484&r1=1361483&r2=1361484&view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java Sat Jul 14 07:39:51 2012 @@ -42,12 +42,14 @@ public class HupaCSS extends WidgetsCSS public static final String C_flash ="hupa-flash"; public static final String C_top_container ="hupa-top"; +public static final String C_central_container ="hupa-central"; public static final String C_main_container ="hupa-main"; public static final String C_bottom_container ="hupa-bottom"; public static final String C_login_container = "hupa-login"; +public static final String C_login_box = "hupa-login-box"; public static final String C_login_form = "hupa-login-form"; -public static final String C_login_box = "hupa-login-textbox"; +public static final String C_login_textbox = "hupa-login-textbox"; public static final String C_contacts_container = "hupa-contacts"; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java?rev=1361484&r1=1361483&r2=1361484&view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java Sat Jul 14 07:39:51 2012 @@ -77,7 +77,7 @@ public class AppView extends Composite i appContainer.addStyleName(HupaCSS.C_app_container); logoContainer.addStyleName(HupaCSS.C_logo_container); topContainer.addStyleName(HupaCSS.C_top_container); -centralContainer.addStyleName(HupaCSS.C_main_container); +centralContainer.addStyleName(HupaCSS.C_central_container); bottomContainer.addStyleName(HupaCSS.C_bottom_container); topWrapper.addStyleName(HupaCSS.C_top_container + "-wrap"); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/
svn commit: r1347659 - /james/hupa/trunk/src/site/xdoc/index.xml
Author: manolo Date: Thu Jun 7 14:59:14 2012 New Revision: 1347659 URL: http://svn.apache.org/viewvc?rev=1347659&view=rev Log: typo Modified: james/hupa/trunk/src/site/xdoc/index.xml Modified: james/hupa/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1347659&r1=1347658&r2=1347659&view=diff == --- james/hupa/trunk/src/site/xdoc/index.xml (original) +++ james/hupa/trunk/src/site/xdoc/index.xml Thu Jun 7 14:59:14 2012 @@ -32,7 +32,7 @@ -Last release is Hupa 0.2: +Last release is Hupa 0.0.2: binary : ready to run or to deploy in any servlet container. sources . @@ -84,7 +84,7 @@ -Jun/2010 - Hupa 0.1 +Jun/2010 - Hupa 0.0.1 First beta release, with an improved interface and fully functional (read, edit, send, secure, attachments, etc) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1347653 - in /james/project/trunk/src/site/xdoc: download.xml index.xml newsarchive.xml
Author: manolo Date: Thu Jun 7 14:52:07 2012 New Revision: 1347653 URL: http://svn.apache.org/viewvc?rev=1347653&view=rev Log: Announcing Hupa 0.0.2 Modified: james/project/trunk/src/site/xdoc/download.xml james/project/trunk/src/site/xdoc/index.xml james/project/trunk/src/site/xdoc/newsarchive.xml Modified: james/project/trunk/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/james/project/trunk/src/site/xdoc/download.xml?rev=1347653&r1=1347652&r2=1347653&view=diff == --- james/project/trunk/src/site/xdoc/download.xml (original) +++ james/project/trunk/src/site/xdoc/download.xml Thu Jun 7 14:52:07 2012 @@ -578,6 +578,28 @@ is found http://maven.apache.org'>Maven repositories on http://repo1.maven.org/maven2/org/apache/james/hupa";>http://repo1.maven.org/maven2/org/apache/james/hupa. + + + + + Modified: james/project/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/project/trunk/src/site/xdoc/index.xml?rev=1347653&r1=1347652&r2=1347653&view=diff == --- james/project/trunk/src/site/xdoc/index.xml (original) +++ james/project/trunk/src/site/xdoc/index.xml Thu Jun 7 14:52:07 2012 @@ -389,6 +389,10 @@ + Jun/2012 - + Apache James Hupa 0.0.2 released + + April/2012 - Apache James Server 3.0-beta4 released Modified: james/project/trunk/src/site/xdoc/newsarchive.xml URL: http://svn.apache.org/viewvc/james/project/trunk/src/site/xdoc/newsarchive.xml?rev=1347653&r1=1347652&r2=1347653&view=diff == --- james/project/trunk/src/site/xdoc/newsarchive.xml (original) +++ james/project/trunk/src/site/xdoc/newsarchive.xml Thu Jun 7 14:52:07 2012 @@ -36,6 +36,10 @@ + Jun 2012 - Apache Hupa 0.0.2 released +The Java Apache Mail Enterprise Server Project is happy to announce + the release of version 0.0.2 of Apache Hupa, the James rich webmail client. + April 2012 - Apache James Server 3.0-beta4 released The Apache James project is happy to announce the release of version 3.0-beta4 of its modular mail server. - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1344215 - in /james/hupa/trunk: client/pom.xml mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml
Author: manolo Date: Wed May 30 12:05:05 2012 New Revision: 1344215 URL: http://svn.apache.org/viewvc?rev=1344215&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: james/hupa/trunk/client/pom.xml james/hupa/trunk/mock/pom.xml james/hupa/trunk/pom.xml james/hupa/trunk/server/pom.xml james/hupa/trunk/shared/pom.xml james/hupa/trunk/widgets/pom.xml Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1344215&r1=1344214&r2=1344215&view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Wed May 30 12:05:05 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.2 +0.0.3-SNAPSHOT ../pom.xml hupa Modified: james/hupa/trunk/mock/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1344215&r1=1344214&r2=1344215&view=diff == --- james/hupa/trunk/mock/pom.xml (original) +++ james/hupa/trunk/mock/pom.xml Wed May 30 12:05:05 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.2 +0.0.3-SNAPSHOT ../pom.xml hupa-mock Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1344215&r1=1344214&r2=1344215&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Wed May 30 12:05:05 2012 @@ -27,7 +27,7 @@ org.apache.james.hupa hupa-parent -0.0.2 +0.0.3-SNAPSHOT pom Apache James Hupa Parent Hupa is a GWT based Webmail @@ -41,9 +41,9 @@ client - scm:svn:http://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.2 - scm:svn:https://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.2 - http://svn.apache.org/viewvc/james/hupa/tags/hupa-parent-0.0.2 + scm:svn:http://svn.apache.org/repos/asf/james/hupa/trunk + scm:svn:https://svn.apache.org/repos/asf/james/hupa/trunk +http://svn.apache.org/viewvc/james/hupa/trunk/ JIRA Modified: james/hupa/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1344215&r1=1344214&r2=1344215&view=diff == --- james/hupa/trunk/server/pom.xml (original) +++ james/hupa/trunk/server/pom.xml Wed May 30 12:05:05 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.2 +0.0.3-SNAPSHOT ../pom.xml hupa-server Modified: james/hupa/trunk/shared/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1344215&r1=1344214&r2=1344215&view=diff == --- james/hupa/trunk/shared/pom.xml (original) +++ james/hupa/trunk/shared/pom.xml Wed May 30 12:05:05 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.2 +0.0.3-SNAPSHOT ../pom.xml hupa-shared Modified: james/hupa/trunk/widgets/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1344215&r1=1344214&r2=1344215&view=diff == --- james/hupa/trunk/widgets/pom.xml (original) +++ james/hupa/trunk/widgets/pom.xml Wed May 30 12:05:05 2012 @@ -22,7 +22,7 @@ org.apache.james.hupa hupa-parent -0.0.2 +0.0.3-SNAPSHOT ../pom.xml hupa-widgets - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1344214 - /james/hupa/tags/hupa-parent-0.0.2/
Author: manolo Date: Wed May 30 12:04:55 2012 New Revision: 1344214 URL: http://svn.apache.org/viewvc?rev=1344214&view=rev Log: [maven-release-plugin] copy for tag hupa-parent-0.0.2 Added: james/hupa/tags/hupa-parent-0.0.2/ - copied from r1344213, james/hupa/trunk/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1344213 - in /james/hupa: branches/ tags/
Author: manolo Date: Wed May 30 12:04:30 2012 New Revision: 1344213 URL: http://svn.apache.org/viewvc?rev=1344213&view=rev Log: tags and branches folders were missing in the hupa folder Added: james/hupa/branches/ james/hupa/tags/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1344210 - in /james/hupa/trunk: client/pom.xml mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml
Author: manolo Date: Wed May 30 12:00:15 2012 New Revision: 1344210 URL: http://svn.apache.org/viewvc?rev=1344210&view=rev Log: [maven-release-plugin] prepare release hupa-parent-0.0.2 Modified: james/hupa/trunk/client/pom.xml james/hupa/trunk/mock/pom.xml james/hupa/trunk/pom.xml james/hupa/trunk/server/pom.xml james/hupa/trunk/shared/pom.xml james/hupa/trunk/widgets/pom.xml Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1344210&r1=1344209&r2=1344210&view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Wed May 30 12:00:15 2012 @@ -17,13 +17,12 @@ specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.james.hupa hupa-parent -0.0.2-SNAPSHOT +0.0.2 ../pom.xml hupa Modified: james/hupa/trunk/mock/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1344210&r1=1344209&r2=1344210&view=diff == --- james/hupa/trunk/mock/pom.xml (original) +++ james/hupa/trunk/mock/pom.xml Wed May 30 12:00:15 2012 @@ -17,15 +17,12 @@ specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.james.hupa hupa-parent -0.0.2-SNAPSHOT +0.0.2 ../pom.xml hupa-mock Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1344210&r1=1344209&r2=1344210&view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Wed May 30 12:00:15 2012 @@ -17,20 +17,17 @@ specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.james james-project 1.8.1 - + org.apache.james.hupa hupa-parent -0.0.2-SNAPSHOT +0.0.2 pom Apache James Hupa Parent Hupa is a GWT based Webmail @@ -44,9 +41,9 @@ client - scm:svn:http://svn.apache.org/repos/asf/james/hupa/trunk - scm:svn:https://svn.apache.org/repos/asf/james/hupa/trunk -http://svn.apache.org/viewvc/james/hupa/trunk/ + scm:svn:http://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.2 + scm:svn:https://svn.apache.org/repos/asf/james/hupa/tags/hupa-parent-0.0.2 + http://svn.apache.org/viewvc/james/hupa/tags/hupa-parent-0.0.2 JIRA @@ -61,7 +58,7 @@ 2.4.0 2.4.0 - + ERROR 7.3.0.v20110203 test @@ -82,7 +79,7 @@ demo - + Modified: james/hupa/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1344210&r1=1344209&r2=1344210&view=diff == --- james/hupa/trunk/server/pom.xml (original) +++ james/hupa/trunk/server/pom.xml Wed May 30 12:00:15 2012 @@ -1,139 +1,136 @@ - - -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org
svn commit: r1342164 - in /james/hupa/trunk: client/pom.xml client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml
Author: manolo
Date: Thu May 24 07:41:46 2012
New Revision: 1342164
URL: http://svn.apache.org/viewvc?rev=1342164&view=rev
Log:
Change the groupId so as james-devels can deploy artifacts in apache maven repo
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
james/hupa/trunk/mock/pom.xml
james/hupa/trunk/pom.xml
james/hupa/trunk/server/pom.xml
james/hupa/trunk/shared/pom.xml
james/hupa/trunk/widgets/pom.xml
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1342164&r1=1342163&r2=1342164&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu May 24 07:41:46 2012
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
-org.apache.hupa
+org.apache.james.hupa
hupa-parent
0.0.2-SNAPSHOT
../pom.xml
@@ -32,19 +32,19 @@
A GWT based IMAP webmail
-org.apache.hupa
+${project.groupId}
hupa-server
-org.apache.hupa
+${project.groupId}
hupa-mock
-org.apache.hupa
+${project.groupId}
hupa-shared
-org.apache.hupa
+${project.groupId}
hupa-widgets
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java?rev=1342164&r1=1342163&r2=1342164&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
Thu May 24 07:41:46 2012
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.GetMessageDetails;
import net.customware.gwt.dispatch.client.ExceptionHandler;
@@ -82,6 +83,9 @@ public class CachingDispatchAsync extend
return;
} else {
running.add(clz);
+if (action instanceof FetchMessages) {
+new RuntimeException().printStackTrace();
+}
super.execute(action, new AsyncCallback() {
public void onFailure(Throwable caught) {
running.remove(clz);
Modified: james/hupa/trunk/mock/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1342164&r1=1342163&r2=1342164&view=diff
==
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu May 24 07:41:46 2012
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
-org.apache.hupa
+org.apache.james.hupa
hupa-parent
0.0.2-SNAPSHOT
../pom.xml
@@ -34,7 +34,7 @@
Mock objects for hupa
-org.apache.hupa
+${project.groupId}
hupa-shared
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1342164&r1=1342163&r2=1342164&view=diff
==
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu May 24 07:41:46 2012
@@ -28,7 +28,7 @@
1.8.1
-org.apache.hupa
+org.apache.james.hupa
hupa-parent
0.0.2-SNAPSHOT
pom
@@ -37,8 +37,8 @@
http://james.apache.org/hupa
2009
-mock
shared
+mock
server
widgets
client
@@ -90,23 +90,23 @@
-org.apache.hupa
+${project.groupId}
hupa-mock
${project.version}
${mock.scope}
-org.apache.hupa
+${project.groupId}
hupa-server
${project.version}
-org.apache.hupa
+${project.groupId}
hupa-shared
${project.version}
-org.apache.hupa
+${project.groupId}
hupa-widgets
${project
svn commit: r1336542 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
Author: manolo
Date: Thu May 10 08:56:18 2012
New Revision: 1336542
URL: http://svn.apache.org/viewvc?rev=1336542&view=rev
Log:
Fix NPE
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java?rev=1336542&r1=1336541&r2=1336542&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
Thu May 10 08:56:18 2012
@@ -203,6 +203,9 @@ public class MessageUtils {
* =?ISO-8859-1?Q?No=20hay=20ma=F1ana?=
*/
public static String encodeEmail(String s) {
+if (s == null) {
+return s;
+}
Pattern p = Pattern.compile("^\\s*(.*?)\\s*(<[^>]+>)\\s*");
Matcher m = p.matcher(s);
return m.matches() ? encodeTexts(m.group(1)) + " " + m.group(2) : s;
@@ -213,9 +216,11 @@ public class MessageUtils {
*/
public static String encodeTexts(String s) {
String ret = s;
-try {
-ret = MimeUtility.encodeText(s, "ISO-8859-1", null);
-} catch (UnsupportedEncodingException e) {
+if (s != null) {
+try {
+ret = MimeUtility.encodeText(s, "ISO-8859-1", null);
+} catch (UnsupportedEncodingException e) {
+}
}
return ret;
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1336525 - in /james/hupa/trunk: server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java shared/src/main
Author: manolo
Date: Thu May 10 08:06:01 2012
New Revision: 1336525
URL: http://svn.apache.org/viewvc?rev=1336525&view=rev
Log:
fix tests
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java?rev=1336525&r1=1336524&r2=1336525&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
Thu May 10 08:06:01 2012
@@ -191,7 +191,6 @@ public class MessageUtils {
} catch (UnsupportedEncodingException e) {
System.out.println(e.getMessage());
}
-System.out.println(s + " " + ret);
ret = ret
// Remove quotes around names in email addresses
.replaceFirst("^[<\"' ]+([^\"<>]*)[>\"' ]+<", "$1 <");
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java?rev=1336525&r1=1336524&r2=1336525&view=diff
==
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
Thu May 10 08:06:01 2012
@@ -58,7 +58,7 @@ public class MessageUtilsTest extends Hu
}
public void testGetRecipients () throws Exception {
-String encodedEmail = "=?ISO-8859-1?Q?Manolo=20Pe=F1a?=
";
+String encodedEmail = "=?ISO-8859-1?Q?Manolo_Pe=F1a?=
";
String decodedEmail = MessageUtils.decodeText(encodedEmail);
assertFalse(encodedEmail.equals(decodedEmail));
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1336525&r1=1336524&r2=1336525&view=diff
==
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Thu May 10 08:06:01 2012
@@ -34,12 +34,16 @@ public class ContactsResult implements R
}
public Contact(String address) {
- mail = address.replaceAll("^.*<([^>]+)>", "$1");
+ mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1");
realname = mail.equals(address) ? mail : address
- .replaceAll("<.+$", "")
- .replaceAll("^[\\s\"']+", "")
- .replaceAll("[\\s\"']+$", "");
+ // remove the email part
+ .replaceAll("<[^<>]+>\\s*$", "")
+ // remove start symbols in the name
+ .replaceAll("^[\\s\"'<]+", "")
+ // remove end symbols in the name
+ .replaceAll("[\\s\"'>]+$", "")
+ ;
if (realname.isEmpty())
realname = mail;
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1336521 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/mvp/ server/src/main/java/org/apache/hupa/server/handler/ server/src/main/java/org/apache/hupa/server/utils/ se
Author: manolo
Date: Thu May 10 08:00:53 2012
New Revision: 1336521
URL: http://svn.apache.org/viewvc?rev=1336521&view=rev
Log:
Encode unstructures RFC 822 ^Caders when sending emails
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=1336521&r1=1336520&r2=1336521&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
Thu May 10 08:00:53 2012
@@ -133,7 +133,8 @@ public class LoginView extends Composite
if (event.getSource().equals(usernameTextBox)) {
passwordTextBox.setFocus(true);
} else if (event.getSource().equals(passwordTextBox)) {
-formPanel.submit();
+submitButton.click();
+//formPanel.submit();
}
}
}
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1336521&r1=1336520&r2=1336521&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
Thu May 10 08:00:53 2012
@@ -19,9 +19,18 @@
package org.apache.hupa.server.handler;
-import com.google.inject.Provider;
+import java.io.IOException;
+import java.util.ArrayList;
-import com.sun.mail.imap.IMAPStore;
+import javax.mail.Address;
+import javax.mail.FetchProfile;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Part;
+import javax.mail.UIDFolder;
+import javax.mail.internet.MimeMessage.RecipientType;
+import javax.servlet.http.HttpSession;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -29,27 +38,16 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
+import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.Tag;
import org.apache.hupa.shared.data.User;
-import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-
-import javax.mail.Address;
-import javax.mail.FetchProfile;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.UIDFolder;
-import javax.mail.internet.MimeUtility;
-import javax.mail.internet.MimeMessage.RecipientType;
-import javax.servlet.http.HttpSession;
+import com.google.inject.Provider;
+import com.sun.mail.imap.IMAPStore;
public abstract class AbstractFetchMessagesHandler
extends AbstractSessionHandler{
@@ -128,13 +126,13 @@ public abstract class AbstractFetchMessa
Message m = messages[i];
String from = null;
if (m.getFrom() != null && m.getFrom().length >0 ) {
-from = decodeText(m.getFrom()[0].toString());
+from = MessageUtils.decodeText(m.getFrom()[0].toString());
}
msg.setFrom(from);
String replyto = null;
if (m.getReplyTo() != null && m.getReplyTo().length >0 ) {
-replyto = decodeText(m.getReplyTo()[0].toString());
+replyto =
svn commit: r1336403 - in /james/hupa/trunk/client: pom.xml src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java src/main/java/org/apache/hupa/client/mvp/LoginView.java src/main/webapp/Hupa.ht
Author: manolo
Date: Wed May 9 21:11:38 2012
New Revision: 1336403
URL: http://svn.apache.org/viewvc?rev=1336403&view=rev
Log:
fix save password in chrome, it needs that submit is not cancelled
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1336403&r1=1336402&r2=1336403&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Wed May 9 21:11:38 2012
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
@@ -77,10 +75,10 @@
com.google.gwt
gwt-user
-
-javax.validation
-validation-api
-
+
+javax.validation
+validation-api
+
@@ -97,9 +95,9 @@
provided
- org.hibernate
- hibernate-validator
- 4.2.0.Final
+org.hibernate
+hibernate-validator
+4.2.0.Final
org.json
@@ -117,14 +115,14 @@
org.slf4j
slf4j-log4j12
-
- org.eclipse.jetty
- jetty-server
-
-
- org.eclipse.jetty
- jetty-webapp
-
+
+org.eclipse.jetty
+jetty-server
+
+
+org.eclipse.jetty
+jetty-webapp
+
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
@@ -135,7 +133,7 @@
Hupa.html
--Xmx512M -Xss128M
-Dhupa.config.file=${project.parent.basedir}/server/src/main/webapp/WEB-INF/conf/config.properties
+-Xmx512M -Xss128M
1
true
@@ -187,11 +185,11 @@
${project.artifactId}-${project.version}
-
-
-
org.apache.hupa.Launcher
-
-
+
+
+org.apache.hupa.Launcher
+
+
@@ -246,7 +244,7 @@
- org.apache.maven.plugins
+org.apache.maven.plugins
maven-resources-plugin
@@ -275,33 +273,33 @@
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
org/apache/hupa/Launcher.class
+
org/apache/hupa/Launcher.class
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
-jetty-classpath
-prepare-package
-
- unpack-dependencies
-
-
-
org.eclipse.jetty,javax.servlet
-
jsp-api,jstl
-
-
${project.build.directory}/${project.artifactId}-${project.version}
-
-
-
-
-
+
+org.apache.maven.plugins
+maven-dependency-plugin
+
svn commit: r1336030 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/HupaCSS.java java/org/apache/hupa/client/mvp/LoginView.java webapp/Hupa.css webapp/Hupa.html
Author: manolo
Date: Wed May 9 09:35:38 2012
New Revision: 1336030
URL: http://svn.apache.org/viewvc?rev=1336030&view=rev
Log:
Make the login page compatible with the browser save password feature, and
replace cobogw buttons by css-stiled ones in it
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java?rev=1336030&r1=1336029&r2=1336030&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
Wed May 9 09:35:38 2012
@@ -77,4 +77,6 @@ public class HupaCSS extends WidgetsCSS
public static final String C_dialog = "hupa-dialog-box";
public static final String C_validate = "hupa-validate-error";
+
+public static final String C_button = "hupa-button";
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=1336030&r1=1336029&r2=1336030&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
Wed May 9 09:35:38 2012
@@ -23,18 +23,23 @@ import org.apache.hupa.client.HupaCSS;
import org.apache.hupa.client.HupaConstants;
import org.apache.hupa.widgets.ui.Loading;
import org.apache.hupa.widgets.ui.RndPanel;
-import org.cobogw.gwt.user.client.ui.Button;
-import org.cobogw.gwt.user.client.ui.ButtonBar;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.Focusable;
+import com.google.gwt.user.client.ui.FormPanel;
+import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
import com.google.gwt.user.client.ui.HasValue;
+import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.PasswordTextBox;
+import com.google.gwt.user.client.ui.SubmitButton;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -46,38 +51,52 @@ import com.google.inject.Inject;
*/
public class LoginView extends Composite implements
KeyUpHandler,LoginPresenter.Display{
-private Button loginButton;
+private Button loginButton = new Button();
+private SubmitButton submitButton;
private Button resetButton;
-private TextBox usernameTextBox = new TextBox();
-private PasswordTextBox passwordTextBox = new PasswordTextBox();
private Loading loading;
+
+// We wrap login/password boxes with a form which must be in the html
document,
+// in this way, the browser knows that we are sending a login form and
+// offers the save password dialog to the user
+private TextBox usernameTextBox =
TextBox.wrap(DOM.getElementById("email"));
+private PasswordTextBox passwordTextBox =
PasswordTextBox.wrap(DOM.getElementById("password"));
+// wrap the form after inputs so as they are in the dom when are wrapped
+final private FormPanel formPanel =
FormPanel.wrap(DOM.getElementById("loginForm"), true);
+
@Inject
public LoginView(HupaConstants constants) {
VerticalPanel mainContainer = new VerticalPanel();
RndPanel rPanel = new RndPanel();
-FlexTable formPanel = new FlexTable();
-ButtonBar buttonBar = new ButtonBar();
-loginButton = new Button(constants.loginButton());
-resetButton = new Button(constants.resetButton());
+FlexTable flexTable = new FlexTable();
+Panel buttonBar = new FlowPanel();
+submitButton = new SubmitButton(constants.loginButton());
+resetButton = new Button(constants.resetButton());
+submitButton.getElement().setClassName(HupaCSS.C_button);
+resetButton.getElement().setClassName(HupaCSS.C_button);
+
submitBut
svn commit: r1335829 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
Author: manolo Date: Tue May 8 23:31:38 2012 New Revision: 1335829 URL: http://svn.apache.org/viewvc?rev=1335829&view=rev Log: fix ocasional array out of bounds error when switching folders Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=1335829&r1=1335828&r2=1335829&view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java Tue May 8 23:31:38 2012 @@ -474,7 +474,7 @@ public class IMAPMessageListView extends pageBox.setSelectedIndex(0); cTableModel.clearCache(); cTableModel.setRowCount(CachedTableModel.UNKNOWN_ROW_COUNT); -//mailTable.gotoFirstPage(); +mailTable.gotoPage(0, false); } /* - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1335396 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ gin/ mvp/ mvp/place/
Author: manolo
Date: Tue May 8 09:40:06 2012
New Revision: 1335396
URL: http://svn.apache.org/viewvc?rev=1335396&view=rev
Log:
Some cache improvements in client side. Fix parallel fetching of messages on
loading
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java?rev=1335396&r1=1335395&r2=1335396&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
Tue May 8 09:40:06 2012
@@ -20,64 +20,112 @@
package org.apache.hupa.client;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.inject.Inject;
+import org.apache.hupa.shared.rpc.GetMessageDetails;
-import net.customware.gwt.dispatch.client.DispatchAsync;
+import net.customware.gwt.dispatch.client.ExceptionHandler;
+import net.customware.gwt.dispatch.client.standard.StandardDispatchAsync;
import net.customware.gwt.dispatch.shared.Action;
import net.customware.gwt.dispatch.shared.Result;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.inject.Inject;
+
/**
- * Dispatcher which support caching of data in memory
+ * Dispatcher which support caching of data in memory.
+ *
+ * It also avoids simultaneous executions of the same action, which
+ * is very useful in development.
*
*/
-public class CachingDispatchAsync implements DispatchAsync {
-
-private DispatchAsync dispatcher;
-private Map, Result> cache = new HashMap,
Result>();
+public class CachingDispatchAsync extends StandardDispatchAsync {
+
@Inject
-public CachingDispatchAsync(DispatchAsync dispatcher) {
-this.dispatcher = dispatcher;
+public CachingDispatchAsync(ExceptionHandler exceptionHandler) {
+super(exceptionHandler);
}
-/*
- * (non-Javadoc)
- * @see net.customware.gwt.dispatch.client.DispatchAsync#execute(A,
com.google.gwt.user.client.rpc.AsyncCallback)
- */
+private Map, Result> cache = new HashMap,
Result>();
+
+private HashSet> running = new HashSet>();
+
+@Override
public , R extends Result> void execute(final A action,
final AsyncCallback callback) {
-dispatcher.execute(action, callback);
+
+if (action instanceof GetMessageDetails) {
+executeWithCache(action, callback);
+} else {
+if (GWT.isProdMode()) {
+super.execute(action, callback);
+} else {
+executeOneRequestPerAction(action, callback);
+}
+}
+}
+
+/**
+ * Avoid parallel executions of the same action
+ */
+public , R extends Result> void
executeOneRequestPerAction (
+final A action, final AsyncCallback callback) {
+
+final Class clz = action.getClass();
+if (running.contains(clz)) {
+System.err.println("ATTENTION: avoiding a parallel execution of
the action: " + action.getClass().getName());
+new RuntimeException().printStackTrace();
+
+return;
+} else {
+running.add(clz);
+super.execute(action, new AsyncCallback() {
+public void onFailure(Throwable caught) {
+running.remove(clz);
+callback.onFailure(caught);
+}
+public void onSuccess(final R result) {
+running.remove(clz);
+callback.onSuccess(result);
+}
+});
+ }
}
/**
- * Execute the give Action. If the Action was executed before it will get
fetched from the cache
- *
- * @param Action implementation
- * @param Result implementation
- * @param action the acti
svn commit: r1335393 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
Author: manolo
Date: Tue May 8 09:33:27 2012
New Revision: 1335393
URL: http://svn.apache.org/viewvc?rev=1335393&view=rev
Log:
Fix viewing of certain html messages
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java?rev=1335393&r1=1335392&r2=1335393&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
Tue May 8 09:33:27 2012
@@ -166,7 +166,7 @@ public class GetMessageDetailsHandler ex
IOException {
boolean isHTML = false;
if (con instanceof String) {
-if (message.getContentType().startsWith("text/html")) {
+if
(message.getContentType().toLowerCase().startsWith("text/html")) {
isHTML = true;
} else {
isHTML = false;
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1334985 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Author: manolo
Date: Mon May 7 12:51:17 2012
New Revision: 1334985
URL: http://svn.apache.org/viewvc?rev=1334985&view=rev
Log:
When reloading folder tree do not remove old one until new data comes
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=1334985&r1=1334984&r2=1334985&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Mon May 7 12:51:17 2012
@@ -34,8 +34,8 @@ import org.apache.hupa.client.widgets.Ha
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.Message.IMAPFlag;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
@@ -59,6 +59,7 @@ import com.google.gwt.event.logical.shar
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
@@ -85,7 +86,7 @@ public class MainView extends Composite
private IMAPMessageListView mListView;
private HupaMessages messages;
private VerticalPanel folderPanel = new VerticalPanel();
-private SimplePanel panel = new SimplePanel();
+private Panel westPanel = new HorizontalPanel();
private HorizontalPanel folderButtonBar = new HorizontalPanel();
private EnableHyperlink newFolderButton;
private EnableHyperlink renameFolderButton;
@@ -144,7 +145,7 @@ public class MainView extends Composite
folderButtonBar.add(deleteFolderButton);
folderPanel.add(folderButtonBar);
folderPanel.add(folderTree);
-panel.add(loader);
+westPanel.add(loader);
confirmFolderDeleteBox.setText(messages.confirmDeleteFolder());
bus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
@@ -160,7 +161,7 @@ public class MainView extends Composite
}
});
-west.add(panel);
+west.add(westPanel);
}
@SuppressWarnings("unused")
@@ -242,11 +243,11 @@ public class MainView extends Composite
public void setLoadingFolders(boolean load) {
if (load) {
loader.show();
-panel.clear();
-panel.add(loader);
+//panel.clear();
+westPanel.add(loader);
} else {
-panel.clear();
-panel.add(folderPanel);
+westPanel.clear();
+westPanel.add(folderPanel);
}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1334957 - in /james/hupa/trunk: mock/src/main/java/org/apache/hupa/server/guice/ mock/src/main/java/org/apache/hupa/server/mock/ server/src/main/java/org/apache/hupa/server/preferences/ s
Author: manolo
Date: Mon May 7 11:22:55 2012
New Revision: 1334957
URL: http://svn.apache.org/viewvc?rev=1334957&view=rev
Log:
For some reason we lost the ability to run integraton tests. Now it is possible
to run tests against real imap servers just replacing mockProperties by
realProperties. Many other changes in tests and configuration as well
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java?rev=1334957&r1=1334956&r2=1334957&view=diff
==
---
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
Mon May 7 11:22:55 2012
@@ -116,27 +116,17 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "143");
put("IMAPS", "false");
-put("TrustStore", "my-truststore");
-put("TrustStorePassword", "my-truststore-password");
-
-put("IMAPConnectionPoolSize", "4");
-put("IMAPConnectionPoolTimeout", "30");
-
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "Trash");
put("DefaultSentFolder", "Sent");
put("DefaultDraftsFolder", "Drafts");
-put("PostFetchMessageCount", "0");
-
put("SMTPServerAddress", "localhost");
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "true");
-put("SessionDebug", "false");
-
-put("DefaultUserSessionId", "just_an_id");
+put("SessionDebug", "true");
}
};
@@ -156,27 +146,17 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "143");
put("IMAPS", "false");
-put("TrustStore", "my-truststore");
-put("TrustStorePassword", "my-truststore-password");
-
-put("IMAPConnectionPoolSize", "4");
-put("IMAPConnectionPoolTimeout", "30");
-
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "INBOX.Trash");
put("DefaultSentFolder", "INBOX.Sent");
put("DefaultDraftsFolder", "INBOX.Drafts");
-put("PostFetchMessageCount", "0");
-
put("SMTPServerAddress", "mail.hotelsearch.com");
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "true");
-put("SessionDebug", "false");
-
-put("DefaultUserSessionId", "just_an_id");
+put("SessionDebug", "true");
}
};
@@ -195,9 +175,6 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "993");
put("IMAPS", "true");
-put("TrustStore", "my-truststore");
-put("TrustStorePassword", "my-trusts
svn commit: r1334955 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
Author: manolo Date: Mon May 7 11:17:38 2012 New Revision: 1334955 URL: http://svn.apache.org/viewvc?rev=1334955&view=rev Log: Reduce the number of queries to the imap server when fetching messages Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1334955&r1=1334954&r2=1334955&view=diff == --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java Mon May 7 11:17:38 2012 @@ -46,6 +46,7 @@ import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.Part; +import javax.mail.UIDFolder; import javax.mail.internet.MimeUtility; import javax.mail.internet.MimeMessage.RecipientType; import javax.servlet.http.HttpSession; @@ -118,6 +119,7 @@ public abstract class AbstractFetchMessa fp.add(FetchProfile.Item.ENVELOPE); fp.add(FetchProfile.Item.FLAGS); fp.add(FetchProfile.Item.CONTENT_INFO); +fp.add(UIDFolder.FetchProfileItem.UID); folder.fetch(messages, fp); // loop over the fetched messages @@ -146,7 +148,6 @@ public abstract class AbstractFetchMessa } } msg.setTo(to); - // Check if a subject exist and if so decode it String subject = m.getSubject(); - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1334952 - in /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice: JavaMailSessionProvider.java LogProvider.java
Author: manolo Date: Mon May 7 11:05:49 2012 New Revision: 1334952 URL: http://svn.apache.org/viewvc?rev=1334952&view=rev Log: Remove duplicated files Removed: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/JavaMailSessionProvider.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/LogProvider.java - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1334109 - in /james/hupa/trunk/server/src: main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
Author: manolo
Date: Fri May 4 18:19:39 2012
New Revision: 1334109
URL: http://svn.apache.org/viewvc?rev=1334109&view=rev
Log:
Fix tests. Test search feature
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java?rev=1334109&r1=1334108&r2=1334109&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
Fri May 4 18:19:39 2012
@@ -68,6 +68,7 @@ public class FetchMessagesHandler extend
@Override
protected MessageConvertArray
getMessagesToConvert(com.sun.mail.imap.IMAPFolder f,
FetchMessages action) throws MessagingException, ActionException {
+
String searchString = action.getSearchString();
int start = action.getStart();
int offset = action.getOffset();
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java?rev=1334109&r1=1334108&r2=1334109&view=diff
==
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
Fri May 4 18:19:39 2012
@@ -72,7 +72,7 @@ public class FetchMessagesHandlerTest ex
FetchMessagesResult result = fetchMessagesHandler.execute(new
FetchMessages(clientfolder, 0, 10, "*"), null);
assertEquals(0, result.getRealCount());
-ByteArrayInputStream is = new ByteArrayInputStream("From:
a...@foo.com\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes());
+ByteArrayInputStream is = new ByteArrayInputStream("From:
a...@foo.com\nTo: b...@foo.com\nSubject: something\n\ndata 1".getBytes());
MimeMessage msg = new MimeMessage(session, is);
serverfolder.addMessages(new Message[]{msg});
result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, "something"), null);
@@ -83,14 +83,17 @@ public class FetchMessagesHandlerTest ex
assertEquals(1, result.getRealCount());
assertEquals(1, result.getMessages().size());
-is = new ByteArrayInputStream("From: a...@foo.com\nTo:
b...@foo.com\nSubject: something\n\ndata".getBytes());
+is = new ByteArrayInputStream("From: a...@foo.com\nTo:
b...@foo.com\nSubject: something\n\ndata 2".getBytes());
msg = new MimeMessage(session, is);
serverfolder.appendMessages(new Message[]{msg});
-result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, "*"), null);
+result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, "data"), null);
assertEquals(2, result.getRealCount());
assertEquals(2, result.getMessages().size());
+result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, "data 2"), null);
+assertEquals(1, result.getRealCount());
+
result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, null), null);
assertEquals(2, serverfolder.getMessageCount());
assertEquals(2, serverfolder.getUnreadMessageCount());
@@ -102,7 +105,7 @@ public class FetchMessagesHandlerTest ex
assertEquals(1, serverfolder.getUnreadMessageCount());
serverfolder.appendMessages(new Message[]{msg});
-result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, "*"), null);
+result = fetchMessagesHandler.execute(new FetchMessages(clientfolder,
0, 10, "data"), null);
assertEquals(3, result.getRealCount());
assertEquals(1, result.getRealUnreadCount());
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333916 - /james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
Author: manolo
Date: Fri May 4 12:43:15 2012
New Revision: 1333916
URL: http://svn.apache.org/viewvc?rev=1333916&view=rev
Log:
Implement search in demo mode
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?rev=1333916&r1=1333915&r2=1333916&view=diff
==
---
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
Fri May 4 12:43:15 2012
@@ -19,9 +19,6 @@
package org.apache.hupa.server.mock;
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,15 +26,18 @@ import java.util.List;
import javax.mail.FetchProfile;
import javax.mail.Flags;
+import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Store;
-import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
+import com.sun.mail.imap.IMAPFolder;
+import com.sun.mail.imap.IMAPStore;
+
public class MockIMAPFolder extends IMAPFolder {
public static final char SEPARATOR = '.';
@@ -256,10 +256,16 @@ public class MockIMAPFolder extends IMAP
}
@Override
-public synchronized Message[] search(SearchTerm arg0)
+public synchronized Message[] search(SearchTerm search)
throws MessagingException {
checkExists();
-return getMessages();
+ArrayList ret = new ArrayList();
+for (Message m : messages) {
+ if (search.match(m)) {
+ ret.add(m);
+ }
+}
+return ret.toArray(new Message[0]);
}
@Override
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333907 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java
Author: manolo
Date: Fri May 4 12:25:33 2012
New Revision: 1333907
URL: http://svn.apache.org/viewvc?rev=1333907&view=rev
Log:
Fix source view in demo mode
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/MessageSourceServlet.java
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=1333907&r1=1333906&r2=1333907&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 May 4 12:25:33 2012
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
+import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.User;
@@ -45,11 +45,11 @@ import com.sun.mail.imap.IMAPStore;
public class MessageSourceServlet extends HttpServlet {
private static final long serialVersionUID = 1245563204035792963L;
-private InMemoryIMAPStoreCache cache;
+private IMAPStoreCache cache;
private Log logger;
@Inject
-public MessageSourceServlet(InMemoryIMAPStoreCache cache, Log logger) {
+public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
this.cache = cache;
this.logger = logger;
}
@@ -87,7 +87,7 @@ public class MessageSourceServlet extend
} catch (Exception e) {
String msg = "Unable to get raw content of msg for user " + user +
" in folder " + folderName + " with uid " + message_uuid;
logger.error(msg, e);
-throw new ServletException(msg);
+throw new ServletException(msg, e);
} finally {
IOUtils.closeQuietly(outs);
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333893 - /james/hupa/trunk/src/site/xdoc/index.xml
Author: manolo Date: Fri May 4 12:11:10 2012 New Revision: 1333893 URL: http://svn.apache.org/viewvc?rev=1333893&view=rev Log: typo Modified: james/hupa/trunk/src/site/xdoc/index.xml Modified: james/hupa/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1333893&r1=1333892&r2=1333893&view=diff == --- james/hupa/trunk/src/site/xdoc/index.xml (original) +++ james/hupa/trunk/src/site/xdoc/index.xml Fri May 4 12:11:10 2012 @@ -52,9 +52,9 @@ Apr/2012 - Hupa evolution accepted -Whe have got a GSOC student who will work with Hupa this Summer -http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"; -target="_blank">making it better. +We have got a http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"; +target="_blank">GSOC student who will work with Hupa this Summer +making it better !. Mar/2012 - removed snapshots Removed snapshot dependencies, updated to last GWT release, - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333874 - in /james/hupa/trunk/server/src/main/java/org/apache/hupa/server: InMemoryIMAPStoreCache.java guice/GuiceServletConfig.java
Author: manolo
Date: Fri May 4 11:00:04 2012
New Revision: 1333874
URL: http://svn.apache.org/viewvc?rev=1333874&view=rev
Log:
Append domain to gmail accounts. Configuration in user home was not being read
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java?rev=1333874&r1=1333873&r2=1333874&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
Fri May 4 11:00:04 2012
@@ -92,7 +92,13 @@ public class InMemoryIMAPStoreCache impl
* @see
org.apache.hupa.server.IMAPStoreCache#get(org.apache.hupa.shared.data.User)
*/
public IMAPStore get(User user) throws MessagingException {
-return get(user.getName(),user.getPassword());
+ IMAPStore ret = get(user.getName(),user.getPassword());
+
+ // TODO: this is a hack, we should have a default domain suffix in
configuration files
+ if (address.contains("gmail.com") && !user.getName().contains("@")) {
+ user.setName(user.getName() + "@gmail.com");
+ }
+ return ret;
}
/*
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java?rev=1333874&r1=1333873&r2=1333874&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java
Fri May 4 11:00:04 2012
@@ -106,7 +106,7 @@ public class GuiceServletConfig extends
if (demoHostName == null || System.getProperty(demoHostName) == null) {
List configurationList = new ArrayList();
configurationList.add(System.getProperty(SYS_PROP_CONFIG_FILE));
-configurationList.add(System.getProperty(System.getenv("HOME") +
"/.hupa/" + CONFIG_FILE_NAME));
+configurationList.add(System.getenv("HOME") + "/.hupa/" +
CONFIG_FILE_NAME);
configurationList.add("/etc/default/hupa");
configurationList.add(servletContextRealPath + "/" +
CONFIG_DIR_IN_WAR + CONFIG_FILE_NAME);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333852 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/mvp/ server/src/main/java/org/apache/hupa/server/handler/ server/src/test/java/org/apache/hupa/server/handler/
Author: manolo
Date: Fri May 4 10:07:35 2012
New Revision: 1333852
URL: http://svn.apache.org/viewvc?rev=1333852&view=rev
Log:
Fix: reply messages was removing the old subject some times
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=1333852&r1=1333851&r2=1333852&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Fri May 4 10:07:35 2012
@@ -117,6 +117,7 @@ public class MainView extends Composite
// Not used so far
// createNorth();
// dockPanel.add(north, DockPanel.NORTH);
+// dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT);
createWest();
dockPanel.add(west, DockPanel.WEST);
@@ -124,7 +125,6 @@ public class MainView extends Composite
createCenter();
dockPanel.add(center, DockPanel.CENTER);
-dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT);
dockPanel.setCellHorizontalAlignment(center, DockPanel.ALIGN_LEFT);
initWidget(dockPanel);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=1333852&r1=1333851&r2=1333852&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
Fri May 4 10:07:35 2012
@@ -294,13 +294,17 @@ public class MessageSendPresenter extend
if (type.equals(Type.NEW) && mailto != null) {
display.getToText().setText(mailto);
} else if (type.equals(Type.FORWARD)) {
-if (oldmessage.getSubject() != null &&
!oldmessage.getSubject().toLowerCase().startsWith("fwd:")) {
-display.getSubjectText().setText("Fwd: " +
oldmessage.getSubject());
-}
+ String subject = oldmessage.getSubject() != null ?
oldmessage.getSubject().trim() : "";
+ if (!subject.toLowerCase().startsWith("fwd:")){
+ subject = "Fwd: " + subject;
+ }
+ display.getSubjectText().setText(subject);
} else if (type.equals(Type.REPLY) || type.equals(Type.REPLY_ALL)) {
-if (oldmessage.getSubject() != null &&
!oldmessage.getSubject().toLowerCase().startsWith("re:")) {
-display.getSubjectText().setText("Re: " +
oldmessage.getSubject());
-}
+ String subject = oldmessage.getSubject() != null ?
oldmessage.getSubject().trim() : "";
+ if (!subject.toLowerCase().startsWith("re:")){
+ subject = "Re: " + subject;
+ }
+ display.getSubjectText().setText(subject);
if (type.equals(Type.REPLY)) {
if (oldmessage.getReplyto() != null &&
!oldmessage.getFrom().contains(oldmessage.getReplyto())) {
display.getToText().setText(oldmessage.getReplyto());
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java?rev=1333852&r1=1333851&r2=1333852&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
Fri May 4 10:07:35 2012
@@ -130,9 +130,6 @@ public class MessageSendView extends Com
new
EmailListValidator(getToText()).addActionForFailure(sAction).addActionForFailure(fAction),
new
NotEmptyValidator(getToText()).addActionForFailure
svn commit: r1333819 - in /james/hupa/trunk: client/pom.xml pom.xml
Author: manolo
Date: Fri May 4 09:15:12 2012
New Revision: 1333819
URL: http://svn.apache.org/viewvc?rev=1333819&view=rev
Log:
Do not deliver hupa with demo stuff by default, use -Pdemo to include it
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/pom.xml
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1333819&r1=1333818&r2=1333819&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Fri May 4 09:15:12 2012
@@ -39,6 +39,10 @@
org.apache.hupa
+hupa-mock
+
+
+org.apache.hupa
hupa-shared
@@ -300,19 +304,4 @@
-
-
-prod
-
- Prod
- true
- true
- TRACE
-
-
-
-
-
- ERROR
-
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1333819&r1=1333818&r2=1333819&view=diff
==
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Fri May 4 09:15:12 2012
@@ -61,14 +61,39 @@
2.4.0
2.4.0
+
+ERROR
7.3.0.v20110203
+test
+
+
+
+
+prod
+
+ Prod
+ true
+ true
+ TRACE
+
+
+
+
+demo
+
+
+
+
+
+
org.apache.hupa
hupa-mock
${project.version}
+${mock.scope}
org.apache.hupa
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333810 - in /james/hupa/trunk: server/src/main/java/org/apache/hupa/server/handler/ server/src/main/java/org/apache/hupa/server/preferences/ server/src/test/java/org/apache/hupa/server/h
Author: manolo
Date: Fri May 4 08:25:12 2012
New Revision: 1333810
URL: http://svn.apache.org/viewvc?rev=1333810&view=rev
Log:
Avoid empty names in contacts
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1333810&r1=1333809&r2=1333810&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
Fri May 4 08:25:12 2012
@@ -127,14 +127,12 @@ public abstract class AbstractFetchMessa
String from = null;
if (m.getFrom() != null && m.getFrom().length >0 ) {
from = decodeText(m.getFrom()[0].toString());
-userPreferences.addContact(from);
}
msg.setFrom(from);
String replyto = null;
if (m.getReplyTo() != null && m.getReplyTo().length >0 ) {
replyto = decodeText(m.getReplyTo()[0].toString());
-userPreferences.addContact(replyto);
}
msg.setReplyto(replyto);
@@ -144,11 +142,11 @@ public abstract class AbstractFetchMessa
if (toArray != null) {
for (Address addr : toArray) {
String mailTo = decodeText(addr.toString());
-userPreferences.addContact(mailTo);
to.add(mailTo);
}
}
msg.setTo(to);
+
// Check if a subject exist and if so decode it
String subject = m.getSubject();
@@ -163,12 +161,16 @@ public abstract class AbstractFetchMessa
if (ccArray != null) {
for (Address addr : ccArray) {
String mailCc = decodeText(addr.toString());
-userPreferences.addContact(mailCc);
cc.add(mailCc);
}
}
msg.setCc(cc);
+userPreferences.addContact(from);
+userPreferences.addContact(to);
+userPreferences.addContact(replyto);
+userPreferences.addContact(cc);
+
// Using sentDate since received date is not useful in the view
when using fetchmail
msg.setReceivedDate(m.getSentDate());
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java?rev=1333810&r1=1333809&r2=1333810&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
Fri May 4 08:25:12 2012
@@ -23,7 +23,6 @@ import org.apache.hupa.shared.rpc.Contac
import java.util.Arrays;
import java.util.List;
-import java.util.regex.Pattern;
/**
*
@@ -60,7 +59,7 @@ public abstract class UserPreferencesSto
final public void addContact(List mails) {
if (mails != null) {
for (String mail: mails) {
- if (!mail.matches(REGEX_OMITTED_EMAILS)) {
+ if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
Contact contact = new Contact(mail);
addContact(contact);
}
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java?rev=1333810&r1=1333809&r2=1333810&view=diff
==
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
Fri May 4 08:25:12 2012
@@ -23,14 +23,24 @@ import junit.framework.Assert;
import org.apache.hupa
svn commit: r1333795 - in /james/hupa/trunk/server/src: main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.jav
Author: manolo
Date: Fri May 4 07:56:34 2012
New Revision: 1333795
URL: http://svn.apache.org/viewvc?rev=1333795&view=rev
Log:
Remove quotes around names in email addresses
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1333795&r1=1333794&r2=1333795&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
Fri May 4 07:56:34 2012
@@ -126,25 +126,15 @@ public abstract class AbstractFetchMessa
Message m = messages[i];
String from = null;
if (m.getFrom() != null && m.getFrom().length >0 ) {
-from = m.getFrom()[0].toString().trim();
-try {
-from = MimeUtility.decodeText(from);
-userPreferences.addContact(from);
-} catch (UnsupportedEncodingException e) {
-logger.debug("Unable to decode from " + from + " " +
e.getMessage());
-}
+from = decodeText(m.getFrom()[0].toString());
+userPreferences.addContact(from);
}
msg.setFrom(from);
String replyto = null;
if (m.getReplyTo() != null && m.getReplyTo().length >0 ) {
-replyto = m.getReplyTo()[0].toString().trim();
-try {
-replyto = MimeUtility.decodeText(replyto);
-userPreferences.addContact(replyto);
-} catch (UnsupportedEncodingException e) {
-logger.debug("Unable to decode replyto " + replyto + " " +
e.getMessage());
-}
+replyto = decodeText(m.getReplyTo()[0].toString());
+userPreferences.addContact(replyto);
}
msg.setReplyto(replyto);
@@ -153,15 +143,9 @@ public abstract class AbstractFetchMessa
Address[] toArray = m.getRecipients(RecipientType.TO);
if (toArray != null) {
for (Address addr : toArray) {
-String mailTo = null;
-try {
-mailTo = MimeUtility.decodeText(addr.toString());
-userPreferences.addContact(mailTo);
-} catch (UnsupportedEncodingException e) {
-logger.debug("Unable to decode mailTo " + mailTo + " "
+ e.getMessage());
-}
-if (mailTo != null)
-to.add(mailTo);
+String mailTo = decodeText(addr.toString());
+userPreferences.addContact(mailTo);
+to.add(mailTo);
}
}
msg.setTo(to);
@@ -169,11 +153,7 @@ public abstract class AbstractFetchMessa
// Check if a subject exist and if so decode it
String subject = m.getSubject();
if (subject != null) {
-try {
-subject = MimeUtility.decodeText(subject);
-} catch (UnsupportedEncodingException e) {
-logger.debug("Unable to decode subject " + subject + " " +
e.getMessage());
-}
+subject = decodeText(subject);
}
msg.setSubject(subject);
@@ -182,15 +162,9 @@ public abstract class AbstractFetchMessa
ArrayList cc = new ArrayList();
if (ccArray != null) {
for (Address addr : ccArray) {
-String mailCc = null;
-try {
- mailCc = MimeUtility.decodeText(addr.toString());
-userPreferences.addContact(mailCc);
-} catch (UnsupportedEncodingException e) {
-logger.debug("Unable to decode mailTo " + mailCc + " "
+ e.getMessage());
-}
-if (mailCc != null)
-cc.add(mailCc);
+String mailCc = decodeText(addr.toString());
+userPreferences.addContact(mailCc);
+cc.add(mailCc);
}
}
msg.setCc(cc);
@@ -26
svn commit: r1333790 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Author: manolo
Date: Fri May 4 07:36:32 2012
New Revision: 1333790
URL: http://svn.apache.org/viewvc?rev=1333790&view=rev
Log:
Remove unused container
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=1333790&r1=1333789&r2=1333790&view=diff
==
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Fri May 4 07:36:32 2012
@@ -114,13 +114,15 @@ public class MainView extends Composite
dockPanel.setSpacing(10);
dockPanel.setWidth("100%");
-createNorth();
+// Not used so far
+// createNorth();
+// dockPanel.add(north, DockPanel.NORTH);
+
createWest();
-createCenter();
-
-dockPanel.add(north, DockPanel.NORTH);
dockPanel.add(west, DockPanel.WEST);
dockPanel.setCellWidth(west, "160px");
+
+createCenter();
dockPanel.add(center, DockPanel.CENTER);
dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT);
dockPanel.setCellHorizontalAlignment(center, DockPanel.ALIGN_LEFT);
@@ -161,6 +163,7 @@ public class MainView extends Composite
west.add(panel);
}
+@SuppressWarnings("unused")
private void createNorth() {
north = new VerticalPanel();
north.setWidth("100%");
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333767 - in /james/hupa/trunk: server/src/main/webapp/WEB-INF/conf/config.properties src/site/resources/demo/index.html
Author: manolo Date: Fri May 4 06:30:34 2012 New Revision: 1333767 URL: http://svn.apache.org/viewvc?rev=1333767&view=rev Log: update default configuration file Modified: james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties james/hupa/trunk/src/site/resources/demo/index.html Modified: james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties?rev=1333767&r1=1333766&r2=1333767&view=diff == --- james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties (original) +++ james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties Fri May 4 06:30:34 2012 @@ -26,14 +26,15 @@ IMAPConnectionPoolSize=4 IMAPConnectionPoolTimeout=30 # Use SSL/TLS to connect to the IMAP server IMAPS=true + # The Truststore when using self-signed certificates on the server # TrustStore=my-truststore # The Truststore's password # TrustStorePassword=changeit -DefaultSentFolder=[Gmail]\Sent -DefaultTrashFolder=[Gmail]\Trash -DefaultDraftsFolder=[Gmail]\Drafts +DefaultSentFolder=[Gmail]/Sent +DefaultTrashFolder=[Gmail]/Trash +DefaultDraftsFolder=[Gmail]/Drafts DefaultInboxFolder=INBOX # Number of Messages to post fetch @@ -51,7 +52,6 @@ SMTPAuth=true # Use SSL/TLS to connect to the SMTP server SMTPS=true -## Remove these lines to use Gmail IMAP AND SMTP -# IMAPServerAddress=demo-mode -# SMTPServerAddress=demo-mode +## Uncomment this line to use Demo mode +# IMAPServerAddress=hupa.demo Modified: james/hupa/trunk/src/site/resources/demo/index.html URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1333767&r1=1333766&r2=1333767&view=diff == --- james/hupa/trunk/src/site/resources/demo/index.html (original) +++ james/hupa/trunk/src/site/resources/demo/index.html Fri May 4 06:30:34 2012 @@ -1,3 +1,4 @@ + @@ -6,15 +7,13 @@
svn commit: r1333497 - /james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
Author: manolo
Date: Thu May 3 15:16:21 2012
New Revision: 1333497
URL: http://svn.apache.org/viewvc?rev=1333497&view=rev
Log:
Fix tests
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java?rev=1333497&r1=1333496&r2=1333497&view=diff
==
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
Thu May 3 15:16:21 2012
@@ -161,12 +161,6 @@ public class GetMessageDetailsHandlerTes
assertTrue(details.getText().length() > 0);
}
-public void testMessageDetails_textHtm2l() throws Exception {
-MessageDetails details = loadMessageDetails("11.msg");
-System.out.println(details.getText());
-assertTrue(details.getText().length() > 0);
-}
-
public void testMessageDetails_multiparMixed_multipartAlternative() throws
Exception {
MessageDetails details = loadMessageDetails("6.msg");
assertEquals(1, details.getMessageAttachments().size());
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333406 - in /james/hupa/trunk/src/site: resources/demo/index.html xdoc/index.xml
Author: manolo
Date: Thu May 3 11:41:04 2012
New Revision: 1333406
URL: http://svn.apache.org/viewvc?rev=1333406&view=rev
Log:
add https link to demo page
Modified:
james/hupa/trunk/src/site/resources/demo/index.html
james/hupa/trunk/src/site/xdoc/index.xml
Modified: james/hupa/trunk/src/site/resources/demo/index.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1333406&r1=1333405&r2=1333406&view=diff
==
--- james/hupa/trunk/src/site/resources/demo/index.html (original)
+++ james/hupa/trunk/src/site/resources/demo/index.html Thu May 3 11:41:04 2012
@@ -6,6 +6,7 @@
body {
background: #eee;
+font-size: 14px;
}
* {
@@ -27,11 +28,13 @@ h2 {
filter: progid : DXImageTransform.Microsoft.Shadow (color='#66',
Direction=135, Strength=1 );
}
-.box {
+.box .warn {
box-shadow: 0 1px 4px grey;
border: 1px solid #7FAAFF;
border-radius: 5px 5px 5px 5px;
overflow: hidden;
+}
+.box {
width: 800px;
padding: 30px;
left: 50%;
@@ -47,6 +50,14 @@ h2 {
margin-bottom: 0px;
min-height: 50%;
}
+.warn {
+background: -moz-linear-gradient(#fae5b0, #eaeaea);
+background: -webkit-linear-gradient(#fae5b0, #eaeaea);
+background: -o-linear-gradient(#fae5b0, #eaeaea);
+filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#fae5b0', endColorstr='#eaeaea',GradientType=0 );
+padding: 10px;
+margin-left: -30px;
+}
img {
margin-top: -62px;
@@ -55,8 +66,12 @@ img {
width: 200px;
}
-li {
- margin-top: 10px;
+li, .warn {
+ margin-top: 10px;
+}
+p {
+ margin-top: 5px;
+ margin-bottom: 0px;
}
@@ -71,18 +86,18 @@ li {
You can select one of our demo instances:
- http://james.zones.apache.org/hupa.demo>Hupa in Demo mode:
+ Hupa in Demo mode: http://james.zones.apache.org/hupa.demo>http:
Username is set to 'demo' and the password is
'demo'
Uses a collection of example
messages and stub
implementations of IMAP and
SMTP servers.
-In this instance you can test
almost the Hupa features,
-but emails you send will never
reach the addressee,
-they only will be saved in the
Sent folder.
+ In this instance you can test
almost the Hupa features,
+ but emails you send will never
reach the addressee,
+and message search is not
implemented.
- http://james.zones.apache.org/hupa.gmail>Hupa for Gmail:
+ Hupa for Gmail: https://james.zones.apache.org/hupa.gmail>https | http://james.zones.apache.org/hupa.gmail>http
It will work with any imap enabled
account in gmail.
You have to provide a valid gmail
username (don't forget
@@ -90,8 +105,19 @@ li {
Because this instance and gmail
servers are far away, and
Hupa caching is not enabled,
you will notice a latency when using
the application.
- You can read your real messages and
use Hupa to send
+ You can read your real messages,
search them, and use Hupa to reply and send
messages to your contacts.
+
+ Like any other email client,
Hupa needs your password in order to
+ get a secure session with your
credentials from gmail servers.
+ Hupa uses SSL
+ channel to comunicate with gmail.
+ In the same way it is recomended
that
+ you use hupa via https so as the
communication between your browser and Hupa
+ were not compromissed.
+ Because this is a demo instance
we are using a
+ self-signed certificate.
+
svn commit: r1333373 - in /james/hupa/trunk: mock/src/main/resources/mime/ server/src/main/java/org/apache/hupa/server/handler/ server/src/main/java/org/apache/hupa/server/preferences/ server/src/test
Author: manolo
Date: Thu May 3 09:09:23 2012
New Revision: 173
URL: http://svn.apache.org/viewvc?rev=173&view=rev
Log:
Fix non ascii characters in CC field. Avoid storing certain contacts
Modified:
james/hupa/trunk/mock/src/main/resources/mime/10.msg
james/hupa/trunk/mock/src/main/resources/mime/6.msg
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
Modified: james/hupa/trunk/mock/src/main/resources/mime/10.msg
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/resources/mime/10.msg?rev=173&r1=172&r2=173&view=diff
==
--- james/hupa/trunk/mock/src/main/resources/mime/10.msg (original)
+++ james/hupa/trunk/mock/src/main/resources/mime/10.msg Thu May 3 09:09:23
2012
@@ -5,7 +5,7 @@ Date: Fri, 15 Jan 2010 12:52:56 +0100
Message-ID:
Subject: Listado de temas a tratar
From: Juan Palomo
-To: =?ISO-8859-1?Q?No hay ma=F1ana?=
+To: =?ISO-8859-1?Q?No=20hay=20ma=F1ana?=
Content-Type: multipart/mixed; boundary=001485f7c300fc945d047d32a46a
X-Virus-Checked: Checked by ClamAV on apache.org
Modified: james/hupa/trunk/mock/src/main/resources/mime/6.msg
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/resources/mime/6.msg?rev=173&r1=172&r2=173&view=diff
==
--- james/hupa/trunk/mock/src/main/resources/mime/6.msg (original)
+++ james/hupa/trunk/mock/src/main/resources/mime/6.msg Thu May 3 09:09:23 2012
@@ -7,7 +7,7 @@ From: Nobody
Date: Tue, 8 Sep 2009 15:48:17 -0300
Subject: [gwt-contrib] Looking for Incubator sponsor for ProgressBar
To: google-web-toolkit-contributors
-Reply-To: g...@foo.com
+Reply-To: en-usn_specialoffer-norep...@newsletter.foo.com
Sender: nob...@foo.com
Precedence: bulk
X-Google-Loop: groups
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=173&r1=172&r2=173&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
Thu May 3 09:09:23 2012
@@ -180,11 +180,18 @@ public abstract class AbstractFetchMessa
// Add cc addresses
Address[] ccArray = m.getRecipients(RecipientType.CC);
ArrayList cc = new ArrayList();
-
if (ccArray != null) {
for (Address addr : ccArray) {
-cc.add(addr.toString());
-}
+String mailCc = null;
+try {
+ mailCc = MimeUtility.decodeText(addr.toString());
+userPreferences.addContact(mailCc);
+} catch (UnsupportedEncodingException e) {
+logger.debug("Unable to decode mailTo " + mailCc + " "
+ e.getMessage());
+}
+if (mailCc != null)
+cc.add(mailCc);
+}
}
msg.setCc(cc);
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java?rev=173&r1=172&r2=173&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
Thu May 3 09:09:23 2012
@@ -134,6 +134,8 @@ public class GetMessageDetailsHandler ex
boolean isHTML = handleParts(message, con, sbPlain, attachmentList);
+System.out.println(isHTML);
+
if (isHTML) {
mDetails.setText(filterHtmlDocument(sbPlain.toString(),
folderName, uid));
} else {
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main
svn commit: r1333329 - /james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
Author: manolo
Date: Thu May 3 07:26:12 2012
New Revision: 129
URL: http://svn.apache.org/viewvc?rev=129&view=rev
Log:
fix font-size and html tagging in editor.
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java?rev=129&r1=128&r2=129&view=diff
==
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
Thu May 3 07:26:12 2012
@@ -68,7 +68,7 @@ public class Editor extends VerticalPane
area.addInitializeHandler(new InitializeHandler() {
public void onInitialize(InitializeEvent event) {
setBodyStyleAttribute("fontFamily", "arial");
-setBodyStyleAttribute("fontSize", "80%");
+setBodyStyleAttribute("fontSize", "12px");
}
});
@@ -101,7 +101,7 @@ public class Editor extends VerticalPane
public void setHTML(String html) {
isNewMessage = html.trim().length() > 0;
-//area.setHTML("" + html
+ "");
+area.setHTML(html);
}
public String getText() {
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333215 - in /james/hupa/trunk/server: ./ bin/
Author: manolo Date: Wed May 2 21:23:02 2012 New Revision: 1333215 URL: http://svn.apache.org/viewvc?rev=1333215&view=rev Log: bin folder should not be in svn Removed: james/hupa/trunk/server/bin/ Modified: james/hupa/trunk/server/ (props changed) Propchange: james/hupa/trunk/server/ -- --- svn:ignore (original) +++ svn:ignore Wed May 2 21:23:02 2012 @@ -4,3 +4,5 @@ war .classpath .project coverage.ec +bin + - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333181 - in /james/hupa/trunk/src/site: resources/apidocs/ resources/apidocs/stylesheet.css resources/demo/ resources/demo/hupa-logo-original-transparent.png resources/demo/index.html xd
Author: manolo
Date: Wed May 2 20:05:33 2012
New Revision: 1333181
URL: http://svn.apache.org/viewvc?rev=1333181&view=rev
Log:
improve hupa site documentation
Added:
james/hupa/trunk/src/site/resources/apidocs/
james/hupa/trunk/src/site/resources/apidocs/stylesheet.css
james/hupa/trunk/src/site/resources/demo/
james/hupa/trunk/src/site/resources/demo/hupa-logo-original-transparent.png
(with props)
james/hupa/trunk/src/site/resources/demo/index.html
Modified:
james/hupa/trunk/src/site/xdoc/index.xml
Added: james/hupa/trunk/src/site/resources/apidocs/stylesheet.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/apidocs/stylesheet.css?rev=1333181&view=auto
==
--- james/hupa/trunk/src/site/resources/apidocs/stylesheet.css (added)
+++ james/hupa/trunk/src/site/resources/apidocs/stylesheet.css Wed May 2
20:05:33 2012
@@ -0,0 +1,55 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the
defaults */
+
+/* Page background color */
+body { background-color: #FF; color:#333; font-size: 100%; }
+
+body { font-size: 0.875em; line-height: 1.286em; font-family: "Helvetica",
"Arial", sans-serif; }
+
+code { color: #777; line-height: 1.286em; font-family: "Consolas", "Lucida
Console", "Droid Sans Mono", "Andale Mono", "Monaco", "Lucida Sans Typewriter";
}
+
+a { text-decoration: none; color: #16569A; /* also try #2E85ED, #0033FF,
#6C93C6, #1D7BBE, #1D8DD2 */ }
+a:hover { color: #EE; background-color: #16569A; }
+a:visited { color: #CC3300; }
+a:visited:hover { color: #fff; background-color: #CC3300; }
+
+table[border="1"] { border: 1px solid #ddd; }
+table[border="1"] td, table[border="1"] th { border: 1px solid #ddd; }
+table[cellpadding="3"] td { padding: 0.5em; }
+
+font[size="-1"] { font-size: 0.85em; line-height: 1.5em; }
+font[size="-2"] { font-size: 0.8em; }
+font[size="+2"] { font-size: 1.4em; line-height: 1.3em; padding: 0.4em 0; }
+
+/* Headings */
+h1 { font-size: 1.5em; line-height: 1.286em;}
+
+/* Table colors */
+.TableHeadingColor { background: #ccc; color:#444; } /* Dark mauve */
+.TableSubHeadingColor { background: #ddd; color:#444; } /* Light mauve */
+.TableRowColor { background: #FF; color:#666; font-size: 0.95em; }
/* White */
+.TableRowColor code{ color:#000; } /* White */
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont { font-size: 100%; }
+.FrameHeadingFont { font-size: 90%; }
+.FrameItemFont { font-size: 0.9em; line-height: 1.3em;
+}
+/* Java Interfaces */
+.FrameItemFont a i {
+ font-style: normal; color: #666;
+}
+.FrameItemFont a:hover i {
+ font-style: normal; color: #fff; background-color: #666;
+}
+
+/* Navigation bar fonts and colors */
+.NavBarCell1{ background-color:#E0E6DF; } /* Light mauve */
+.NavBarCell1Rev { background-color:#16569A; color:#FF} /* Dark Blue */
+.NavBarFont1{ }
+.NavBarFont1Rev { color:#FF; }
+
+.NavBarCell2{ background-color:#FF; color:#00}
+.NavBarCell3{ background-color:#FF; color:#00}
+
Added:
james/hupa/trunk/src/site/resources/demo/hupa-logo-original-transparent.png
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/hupa-logo-original-transparent.png?rev=1333181&view=auto
==
Binary file - no diff available.
Propchange:
james/hupa/trunk/src/site/resources/demo/hupa-logo-original-transparent.png
--
svn:mime-type = application/octet-stream
Added: james/hupa/trunk/src/site/resources/demo/index.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1333181&view=auto
==
--- james/hupa/trunk/src/site/resources/demo/index.html (added)
+++ james/hupa/trunk/src/site/resources/demo/index.html Wed May 2 20:05:33 2012
@@ -0,0 +1,102 @@
+
+
+
+
+Hupa webmail Demo
+
+body {
+ background: #eee;
+}
+
+* {
+ font-family: arial;
+}
+
+h2 {
+ float: left;
+}
+
+.title {
+ font-size: 2.5em;
+ text-align: center;
+ background: -moz-linear-gradient(#C5D9FF, #FF);
+ background: -webkit-linear-gradient(#C5D9FF, #FF);
+ background: -o-linear-gradient(#C5D9FF, #FF);
+ filter: progid :
DXImageTransform.Microsoft.gradient(startColorstr='#C5D9FF',
endColorstr='#FF', GradientType=0 );
+ text-shadow: 1px 3px 3px #66;
+ filter: progid : DXImageTransform.Microsoft.Shadow (color='#66',
Direction=135, Strength=1 );
+}
+
+.box {
+
svn commit: r1333121 - /james/hupa/trunk/README.txt
Author: manolo
Date: Wed May 2 17:20:19 2012
New Revision: 1333121
URL: http://svn.apache.org/viewvc?rev=1333121&view=rev
Log:
Update info about how to use demo-mode
Modified:
james/hupa/trunk/README.txt
Modified: james/hupa/trunk/README.txt
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/README.txt?rev=1333121&r1=1333120&r2=1333121&view=diff
==
--- james/hupa/trunk/README.txt (original)
+++ james/hupa/trunk/README.txt Wed May 2 17:20:19 2012
@@ -7,10 +7,10 @@ $ mvn clean package
Hupa uses a properties file to know the IMAP and SMTP servers configuration.
There is an example configuration file in
'server/src/main/webapp/WEB-INF/conf/config.properties'
-- You can put your configuration parameters in either of these files:
+- You can set your configuration parameters in either of these files:
$HOME/.hupa/config.properties
/etc/default/hupa
-- Or anywhere if you start your application server with the parameter:
+- Or in any other file if you start your application server with the parameter:
-Dhupa.config.file=full_path_to_your_properties_file
# Running Hupa ##
@@ -26,13 +26,15 @@ If you prefer to use any other servlet c
By default hupa is configurated as a gmail imap/smtp client, use any gmail
valid account to login.
NOTE: that previously to use a gmail account via imap you should enable imap
in your gmail account.
-## Using hupa in demo mode #
+## Demo Mode #
In demo mode it is not necessary any imap or smtp server.
A bunch of example messages and folders are shown to the user to be
manipulated.
Almost every hupa feature work in demo mode.
-To enable demo mode for incoming messages set 'IMAPServerAddress=demo-mode' and
-'SMTPServerAddress=demo-mode' for outgoing messages.
+To enable demo mode set 'IMAPServerAddress=hupa.demo' or start your servlet
container with the
+parameter 'hupa.demo'
+
+$ java -Dhupa.demo -jar target/hupa-${version}.war
To login into the system in this mode use the user 'demo' with password 'demo'
@@ -42,9 +44,10 @@ and google plugins, then go to Import ->
shared, mock, server, widget and client.
- To run hupa in hosted mode, select: Run as -> (Google) Web application.
- * May be you need to specify the appropriate hupa configuration file if you
do not
-have a suitable file in $HOME/.hupa or /etc/default/hupa you should add
the following line
-to the "vm argument" in the Run configuration:
+ * May be you need to specify the appropriate hupa configuration file if you
do not want to
+run it in demo mode.
+If you don't have a suitable file in $HOME/.hupa or /etc/default/hupa you
have to add the
+following line to the "vm argument" in the Run configuration:
-Dhupa.config.file=folder_to_hupa_dources/server/src/main/webapp/WEB-INF/conf/config.properties
- If you compile hupa with google's eclipse plugin and you get the message:
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333120 - in /james/hupa/trunk/client/src/test/java/org/apache/hupa/client: HupaMvpTestCase.java guice/GuiceClientTestModule.java
Author: manolo
Date: Wed May 2 17:19:47 2012
New Revision: 1333120
URL: http://svn.apache.org/viewvc?rev=1333120&view=rev
Log:
Fix client tests
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java?rev=1333120&r1=1333119&r2=1333120&view=diff
==
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
Wed May 2 17:19:47 2012
@@ -78,6 +78,7 @@ public abstract class HupaMvpTestCase ex
store = storeCache.get(testUser);
httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
} catch (Exception e) {
+e.printStackTrace();
}
}
}
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java?rev=1333120&r1=1333119&r2=1333120&view=diff
==
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
Wed May 2 17:19:47 2012
@@ -19,13 +19,15 @@
package org.apache.hupa.client.guice;
+import java.util.Properties;
+
import javax.mail.Session;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
import org.apache.hupa.server.guice.AbstractGuiceTestModule;
+import
org.apache.hupa.server.guice.demo.DemoGuiceServerModule.DemoIMAPStoreCache;
import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
import org.apache.hupa.server.handler.AbstractSendMessageHandler;
@@ -48,6 +50,7 @@ import org.apache.hupa.server.mock.MockI
import org.apache.hupa.server.mock.MockLogProvider;
import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
+import org.apache.hupa.server.utils.ConfigurationProperties;
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.Contacts;
@@ -64,7 +67,11 @@ public class GuiceClientTestModule exten
@Override
protected void configureHandlers() {
- Names.bindProperties(binder(), MockConstants.mockProperties);
+
+ Properties p = MockConstants.mockProperties;
+ ConfigurationProperties.validateProperties(p);
+
+ Names.bindProperties(binder(), p);
bind(Session.class).toProvider(JavaMailSessionProvider.class);
bind(HttpSession.class).toProvider(MockHttpSessionProvider.class);
@@ -72,7 +79,7 @@ public class GuiceClientTestModule exten
bind(Log.class).toProvider(MockLogProvider.class).in(Singleton.class);
bind(IMAPStore.class).to(MockIMAPStore.class);
-
bind(IMAPStoreCache.class).to(InMemoryIMAPStoreCache.class).in(Singleton.class);
+
bind(IMAPStoreCache.class).to(DemoIMAPStoreCache.class).in(Singleton.class);
bind(LoginUserHandler.class);
bind(LogoutUserHandler.class);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1333089 [2/2] - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/mvp/ client/src/test/java/org/apache/hupa/client/guice/ mock/src/ma
Added:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java?rev=1333089&view=auto
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
(added)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
Wed May 2 16:05:26 2012
@@ -0,0 +1,36 @@
+/
+ * 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.guice.providers;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.impl.Log4JLogger;
+
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+@Singleton
+public class LogProvider implements Provider{
+
+public Log get() {
+return new Log4JLogger("HupaLogger");
+}
+
+}
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java?rev=1333089&r1=1333088&r2=1333089&view=diff
==
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
Wed May 2 16:05:26 2012
@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
import javax.activation.DataSource;
import javax.mail.Address;
@@ -53,7 +52,6 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.logging.Log;
import org.apache.hupa.server.FileItemRegistry;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.mock.MockSMTPTransport;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.server.utils.RegexPatterns;
@@ -76,13 +74,12 @@ import com.sun.mail.imap.IMAPStore;
*/
public abstract class AbstractSendMessageHandler
extends AbstractSessionHandler {
-private final Properties props = new Properties();
private final boolean auth;
private final String address;
private final int port;
private boolean useSSL = false;
-private Provider httpSessionProvider;
UserPreferencesStorage userPreferences;
+Session session;
@Inject
public AbstractSendMessageHandler(Log logger, IMAPStoreCache store,
Provider provider, UserPreferencesStorage preferences,
@Named("SMTPServerAddress") String address, @Named("SMTPServerPort") int port,
@Named("SMTPAuth") boolean auth, @Named("SMTPS") boolean useSSL) {
@@ -91,9 +88,9 @@ public abstract class AbstractSendMessag
this.address = address;
this.port = port;
this.useSSL = useSSL;
-this.httpSessionProvider = provider;
-props.put("mail.smtp.auth", auth);
this.userPreferences = preferences;
+this.session = store.getMailSession();
+session.getProperties().put("mail.smtp.auth", auth);
}
@Override
@@ -101,13 +98,12 @@ public abstract class AbstractSendMessag
throws ActionException {
GenericResult result = new GenericResult();
try {
-Session session = Session.getDefaultInstance(props);
Message message = createMessage(session, action);
message = fillBody(message,action);
-sendMessage(session, getUser(), message);
-
svn commit: r1332287 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/ webapp/ webapp/images/
Author: manolo
Date: Mon Apr 30 16:52:04 2012
New Revision: 1332287
URL: http://svn.apache.org/viewvc?rev=1332287&view=rev
Log:
Send deflated js. Fix favicon transparency. Css gradients in opera. Use
xsiframe linker
Added:
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-original-transparent.png
- copied, changed from r1332199,
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-original-transparent.jpg
Removed:
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-original-transparent.jpg
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
james/hupa/trunk/client/src/main/webapp/favicon.ico
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1332287&r1=1332286&r2=1332287&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Mon Apr
30 16:52:04 2012
@@ -37,15 +37,18 @@
-
-
-
+
+
+
+
+
+
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1332287&r1=1332286&r2=1332287&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml Mon
Apr 30 16:52:04 2012
@@ -18,6 +18,10 @@
+
+
+
+
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1332287&r1=1332286&r2=1332287&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Mon Apr 30 16:52:04 2012
@@ -361,26 +361,31 @@ body {
.hupa-top-wrap, .hupa-login-form, .hupa-msg-top-bar {
background: -moz-linear-gradient(#FF, #C5D9FF);
background: -webkit-linear-gradient(#FF, #C5D9FF);
+background: -o-linear-gradient(#FF, #C5D9FF);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#FF', endColorstr='#C5D9FF',GradientType=0 );
}
.hupa-commands-bar {
background: -moz-linear-gradient(#C5D9FF, #eaeaea);
background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
+background: -o-linear-gradient(#C5D9FF, #eaeaea);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
}
.hupa-tree {
background: -moz-linear-gradient(#C5D9FF, #eaeaea);
background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
+background: -o-linear-gradient(#C5D9FF, #eaeaea);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
}
div.hupa-main {
background: -moz-linear-gradient(#eaeaea, #fafafa);
background: -webkit-linear-gradient(#eaeaea, #fafafa);
+background: -o-linear-gradient(#eaeaea, #fafafa);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#eaeaea', endColorstr='#fafafa',GradientType=0 );
}
.hupa-flash, .hupa-dialog-box td.dialogMiddleCenter {
background: -moz-linear-gradient(#fae5b0, #eaeaea);
background: -webkit-linear-gradient(#fae5b0, #eaeaea);
+background: -o-linear-gradient(#fae5b0, #eaeaea);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#fae5b0', endColorstr='#eaeaea',GradientType=0 );
}
.hupa-login-form, .hupa-bottom {
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1332287&r1=1332286&r2=1332287&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Mon Apr 30 16:52:04 2012
@@ -18,6 +18,8 @@
+
+
Hupa webmail
Modified: james/hupa/trunk/client/src/main/webapp/favicon.ico
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/favicon.ico?rev=1332287&r1=1332286&r2=1332287&view=diff
svn commit: r1332262 - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/webapp/ server/src/main/java/org/apache/hupa/server/servlet/ widgets/src/main/java/org/apa
Author: manolo
Date: Mon Apr 30 15:50:01 2012
New Revision: 1332262
URL: http://svn.apache.org/viewvc?rev=1332262&view=rev
Log:
Opera supports css3 borders. Fix content-length when downloading attachments
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/pom.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1332262&r1=1332261&r2=1332262&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Mon Apr 30 15:50:01 2012
@@ -137,6 +137,7 @@
true
${gwt.disableClassMetadata}
${gwt.disableCastChecking}
+${gwt.logLevel}
org.apache.hupa.Hupa${gwt.moduleSuffix}
@@ -306,10 +307,12 @@
Prod
true
true
+ TRACE
+ ERROR
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1332262&r1=1332261&r2=1332262&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Mon Apr
30 15:50:01 2012
@@ -46,6 +46,9 @@
+
+
+
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1332262&r1=1332261&r2=1332262&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml Mon
Apr 30 15:50:01 2012
@@ -22,9 +22,7 @@
-
-
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1332262&r1=1332261&r2=1332262&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Mon Apr 30 15:50:01 2012
@@ -338,7 +338,7 @@ table.hupa-contacts {
}
.hupa-IMAPFolder-selected {
-background: #C3D9FF;
+background: #f1e77b;
width: 100%;
}
@@ -353,42 +353,39 @@ table.hupa-contacts {
/ HTML5 shadows and gradients /
body {
- background: #eaeaea;
+background: #eaeaea;
}
.hupa-rounded {
box-shadow: 0 1px 4px grey;
}
.hupa-top-wrap, .hupa-login-form, .hupa-msg-top-bar {
background: -moz-linear-gradient(#FF, #C5D9FF);
-background: -o-linear-gradient(#FF, #C5D9FF);
background: -webkit-linear-gradient(#FF, #C5D9FF);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#FF', endColorstr='#C5D9FF',GradientType=0 );
}
.hupa-commands-bar {
background: -moz-linear-gradient(#C5D9FF, #eaeaea);
-background: -o-linear-gradient(#C5D9FF, #eaeaea);
background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
}
.hupa-tree {
background: -moz-linear-gradient(#C5D9FF, #eaeaea);
-background: -o-linear-gradient(#C5D9FF, #eaeaea);
background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
}
div.hupa-main {
-background: -moz-linear-gradient(#eaeaea, #cacaca);
-background: -o-linear-gradient(#eaeaea, #cacaca);
-background: -webkit-linear-gradient(#eaeaea, #cacaca);
-filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#eaeaea', endColorstr='#cacaca',GradientType=0 );
-}
-.hupa-login-form, .hupa-bottom {
-text-shadow: 3px 3px 3px #66;
-/* filter: progid:DXIma
svn commit: r1332172 - /james/hupa/trunk/client/pom.xml
Author: manolo Date: Mon Apr 30 12:25:32 2012 New Revision: 1332172 URL: http://svn.apache.org/viewvc?rev=1332172&view=rev Log: Fix compilation in non production mode Modified: james/hupa/trunk/client/pom.xml Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1332172&r1=1332171&r2=1332172&view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Mon Apr 30 12:25:32 2012 @@ -309,4 +309,7 @@ + + + - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1332166 - in /james/hupa/trunk/client: pom.xml src/main/java/org/apache/hupa/Hupa.gwt.xml src/main/java/org/apache/hupa/HupaProd.gwt.xml src/main/webapp/Hupa.css
Author: manolo
Date: Mon Apr 30 11:51:57 2012
New Revision: 1332166
URL: http://svn.apache.org/viewvc?rev=1332166&view=rev
Log:
Compile all locale and browser permutations when using production profile
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
james/hupa/trunk/client/src/main/webapp/Hupa.css
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1332166&r1=1332165&r2=1332166&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Mon Apr 30 11:51:57 2012
@@ -135,10 +135,10 @@
1
true
-true
-true
+
${gwt.disableClassMetadata}
+
${gwt.disableCastChecking}
-org.apache.hupa.Hupa
+
org.apache.hupa.Hupa${gwt.moduleSuffix}
@@ -299,4 +299,14 @@
+
+
+prod
+
+ Prod
+ true
+ true
+
+
+
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1332166&r1=1332165&r2=1332166&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Mon Apr
30 11:51:57 2012
@@ -35,6 +35,7 @@
+
@@ -46,84 +47,10 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
-
Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1332166&view=auto
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
(added)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml Mon
Apr 30 11:51:57 2012
@@ -0,0 +1,32 @@
+
+
+http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1332166&r1=1332165&r2=1332166&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Mon Apr 30 11:51:57 2012
@@ -25,7 +25,7 @@ body, table td, select, * {
/[ widget: MyDialogBox ]/
.hupa-dialog-box td.dialogMiddleCenter {
- background: #fae5b0 !important;
+ background: #fae5b0;
}
.hupa-dialog-box .dialogContent .gwt-Label {
font-weight: bold;
@@ -365,10 +365,10 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#FF', endColorstr='#C5D9FF',GradientType=0 );
}
.hupa-commands-bar {
-background: -moz-linear-gradient(#C5D9FF, #deeeff);
-background: -o-linear-gradient(#C5D9FF, #deeeff);
-background: -webkit-linear-gradient(#C5D9FF, #deeeff);
-filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#deeeff',GradientType=0 );
+background: -moz-linear-gradient(#C5D9FF, #eaeaea);
+background: -o-linear-gradient(#C5D9FF, #eaeaea);
+background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
+filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
}
.hupa-tree {
background: -moz-linear-gradient(#C5D9FF, #eaeaea);
@@ -377,12 +377,18 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
}
div.hupa-main {
-background: -moz-linear-gradient(#eaeaea, #ff);
-background: -o-linear-gradient(#eaeaea, #ff);
-background: -webkit-linear-gradient(#eaeaea, #ff);
-filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#eaeaea', endColorstr='#ff',GradientType=0 );
+background: -moz-linear-gradient(#eaeaea, #cacaca);
+background: -o-linear-gradient(#eaeaea, #cacaca);
+backgr
svn commit: r1331999 - in /james/hupa/trunk/client/src/main/webapp: Hupa.css images/hupa-logo-64-transparent.png images/hupa-logo-original-transparent.jpg
Author: manolo
Date: Sun Apr 29 21:08:30 2012
New Revision: 1331999
URL: http://svn.apache.org/viewvc?rev=1331999&view=rev
Log:
A few css modifications to add shadows and gradients
Added:
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-64-transparent.png
(with props)
Modified:
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-original-transparent.jpg
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1331999&r1=1331998&r2=1331999&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Sun Apr 29 21:08:30 2012
@@ -38,8 +38,8 @@ body, table td, select, * {
/[ widget: RndPanel ]/
.hupa-rounded {
border: 1px solid #7FAAFF;
- -moz-border-radius: 5px;
- -webkit-border-radius: 4px;
+ border-radius: 5px;
+ overflow: hidden;
}
/[ widget: Loading ]*/
@@ -81,10 +81,10 @@ div.Hupa {
margin-top: 15px;
}
div.hupa-logo {
-width: 75px;
+width: 90px;
height: 64px;
float: left;
- background: url(images/hupa-logo-64.jpg) no-repeat;
+ background: url(images/hupa-logo-64-transparent.png) no-repeat;
}
div.hupa-top {
@@ -121,7 +121,7 @@ div.hupa-loginfo-label, div.hupa-loginfo
margin-right: 15px;
}
div.hupa-header {
-color: #C5D9FF;
+color: transparent;
padding-left: 10px;
height: 32px;
}
@@ -315,10 +315,6 @@ table.hupa-contacts {
color:#FF;
}
-
-
-
-
.gwt-ScrollTable .dataTable td {
border-top:1pt solid #EE;
white-space: nowrap;
@@ -354,3 +350,39 @@ table.hupa-contacts {
border: 2px solid #C3D9FF;
}
+/ HTML5 shadows and gradients /
+
+body {
+ background: #eaeaea;
+}
+.hupa-rounded {
+box-shadow: 0 1px 4px grey;
+}
+.hupa-top-wrap, .hupa-login-form, .hupa-msg-top-bar {
+background: -moz-linear-gradient(#FF, #C5D9FF);
+background: -o-linear-gradient(#FF, #C5D9FF);
+background: -webkit-linear-gradient(#FF, #C5D9FF);
+filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#FF', endColorstr='#C5D9FF',GradientType=0 );
+}
+.hupa-commands-bar {
+background: -moz-linear-gradient(#C5D9FF, #deeeff);
+background: -o-linear-gradient(#C5D9FF, #deeeff);
+background: -webkit-linear-gradient(#C5D9FF, #deeeff);
+filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#deeeff',GradientType=0 );
+}
+.hupa-tree {
+background: -moz-linear-gradient(#C5D9FF, #eaeaea);
+background: -o-linear-gradient(#C5D9FF, #eaeaea);
+background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
+filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 );
+}
+div.hupa-main {
+background: -moz-linear-gradient(#eaeaea, #ff);
+background: -o-linear-gradient(#eaeaea, #ff);
+background: -webkit-linear-gradient(#eaeaea, #ff);
+filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#eaeaea', endColorstr='#ff',GradientType=0 );
+}
+.hupa-login-form, .hupa-bottom {
+text-shadow: 3px 3px 3px #66;
+filter: progid:DXImageTransform.Microsoft.Shadow(color='#66',
Direction=135, Strength=4);
+}
Added:
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-64-transparent.png
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/images/hupa-logo-64-transparent.png?rev=1331999&view=auto
==
Binary file - no diff available.
Propchange:
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-64-transparent.png
--
svn:mime-type = application/octet-stream
Modified:
james/hupa/trunk/client/src/main/webapp/images/hupa-logo-original-transparent.jpg
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/images/hupa-logo-original-transparent.jpg?rev=1331999&r1=1331998&r2=1331999&view=diff
==
Binary files - no diff available.
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
