You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 04:42:12 UTC
svn commit: r1522132 [2/4] - 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/gin/
client/src/main/java/org/apache/hupa/client/mvp/ client/sr...
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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 02:42:10 2013
@@ -17,6 +17,7 @@
under the License.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
/************[ Fonts ]***************************/
body,table td,select,* {
font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana;
@@ -41,6 +42,8 @@ body.noscroll { /* also avoids bounce ef
}
=======
+=======
+>>>>>>> first commit
/************[ Fonts ]***************************/
body, table td, select, * {
@@ -52,12 +55,16 @@ body, table td, select, * {
.hupa-dialog-box td.dialogMiddleCenter {
background: #fae5b0;
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
.hupa-dialog-box .dialogContent .gwt-Label {
font-weight: bold;
margin: 15px;
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-dialog-box .Caption {
font-size: 14px;
@@ -65,11 +72,16 @@ body, table td, select, * {
.hupa-dialog-box .Caption {
font-size: 14px;
>>>>>>> first commit
+=======
+.hupa-dialog-box .Caption {
+ font-size: 14px;
+>>>>>>> first commit
}
/************[ widget: RndPanel ]****************/
.hupa-rounded {
<<<<<<< HEAD
+<<<<<<< HEAD
border: 1px solid #7FAAFF;
border-radius: 5px;
overflow: hidden;
@@ -78,6 +90,11 @@ body, table td, select, * {
border-radius: 5px;
overflow: hidden;
>>>>>>> first commit
+=======
+ border: 1px solid #7FAAFF;
+ border-radius: 5px;
+ overflow: hidden;
+>>>>>>> first commit
}
/************[ widget: Loading ]*************************************/
@@ -87,6 +104,7 @@ div.hupa-loading {
width: 100px;
height: 14px;
<<<<<<< HEAD
+<<<<<<< HEAD
white-space: nowrap;
margin-top: 5px;
margin-left: auto;
@@ -94,12 +112,17 @@ div.hupa-loading {
text-align: left;
vertical-align: top;
=======
+=======
+>>>>>>> first commit
white-space: nowrap;
margin-top: 5px;
margin-left: auto;
margin-right: auto;
text-align: left;
vertical-align: top;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
}
@@ -110,6 +133,7 @@ div.hupa-loading {
cursor: pointer;
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-hyperlink .gwt-Hyperlink-disabled {
color: #8d8d8d;
@@ -117,10 +141,15 @@ div.hupa-loading {
div.gwt-Hyperlink,div.gwt-Anchor {
=======
+=======
+>>>>>>> first commit
.hupa-hyperlink .gwt-Hyperlink-disabled {
color: #8d8d8d;
}
div.gwt-Hyperlink, div.gwt-Anchor {
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
padding-left: 4px;
}
@@ -132,6 +161,7 @@ div.Hupa {
padding: 0px;
width: 100%;
<<<<<<< HEAD
+<<<<<<< HEAD
min-width: 400px;
}
@@ -154,6 +184,8 @@ div.hupa-top {
}
=======
+=======
+>>>>>>> first commit
min-width: 920px;
}
* html div.Hupa {
@@ -173,21 +205,28 @@ div.hupa-top {
* html div.hupa-top {
padding-left: 0px;
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
div.hupa-top-wrap {
height: 64px;
background-color: #C5D9FF;
}
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
div.cgb-RPC-hupa-top-wrap {
height: 59px;
}
table.hupa-top {
<<<<<<< HEAD
+<<<<<<< HEAD
width: 100%;
margin-bottom: 0px;
}
@@ -197,11 +236,17 @@ table.hupa-top {
margin-bottom: 0px;
}
>>>>>>> first commit
+=======
+ width: 100%;
+ margin-bottom: 0px;
+}
+>>>>>>> first commit
table.hupa-button-bar td div {
padding-top: 12px;
}
<<<<<<< HEAD
+<<<<<<< HEAD
div.hupa-loginfo-label,div.hupa-loginfo-user {
margin-left: 10px;
margin-right: 10px;
@@ -212,11 +257,17 @@ div.hupa-loginfo-label, div.hupa-loginfo
margin-left: 10px;
}
>>>>>>> first commit
+=======
+div.hupa-loginfo-label, div.hupa-loginfo-user {
+ margin-left: 10px;
+}
+>>>>>>> first commit
.hupa-loginfo-user {
font-style: italic;
font-weight: bold;
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-menu-button {
margin-right: 15px;
@@ -225,32 +276,44 @@ div.hupa-loginfo-label, div.hupa-loginfo
div.hupa-header {
display: none;
=======
+=======
+>>>>>>> first commit
.hupa-menu-button {
margin-right: 15px;
}
div.hupa-header {
color: transparent;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
padding-left: 10px;
height: 32px;
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-central {
clear: both;
margin: 8px 8px 8px 8px;
min-height: 200px;
=======
+=======
+>>>>>>> first commit
div.hupa-main {
clear: both;
margin: 8px 8px 8px 8px;
min-height: 500px;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
}
* html div.cgb-RPC-hupa-main {
height: 500px;
<<<<<<< HEAD
+<<<<<<< HEAD
text-align: center;
}
@@ -265,6 +328,8 @@ div.hupa-main {
}
=======
+=======
+>>>>>>> first commit
text-align: center;
}
@@ -278,12 +343,16 @@ div.hupa-flash {
top: 45px;
left: 25%;
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
* html div.hupa-flash {
border: none;
background: none;
}
<<<<<<< HEAD
+<<<<<<< HEAD
* html .hupa-flash div {
background-color: #fae5b0;
@@ -291,6 +360,10 @@ div.hupa-flash {
* html .hupa-flash div {
background-color: #fae5b0;
>>>>>>> first commit
+=======
+* html .hupa-flash div {
+ background-color: #fae5b0;
+>>>>>>> first commit
}
.hupa-flash div.gwt-Label {
@@ -302,6 +375,7 @@ div.hupa-bottom {
}
/************[ view: LoginView ]*******************/
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-login {
margin: 10pt auto;
width: 20%;
@@ -320,6 +394,8 @@ div.hupa-bottom {
.hupa-login-form {
=======
+=======
+>>>>>>> first commit
table.hupa-login {
text-align: right;
margin-left: auto;
@@ -332,6 +408,9 @@ table.hupa-login td {
padding-top: 6px;
}
table.hupa-login-form {
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
padding: 10px;
}
@@ -339,10 +418,14 @@ table.hupa-login-form {
.hupa-login-textbox {
width: 230px;
<<<<<<< HEAD
+<<<<<<< HEAD
background-color: #d8ecfd;
=======
background-color: #d8ecfd;
>>>>>>> first commit
+=======
+ background-color: #d8ecfd;
+>>>>>>> first commit
border: 1px solid #7FAAFF;
margin-left: 5px;
}
@@ -357,6 +440,7 @@ table.hupa-login-form {
.hupa-commands-bar {
width: 100%;
<<<<<<< HEAD
+<<<<<<< HEAD
background-color: #deeeff;
}
@@ -373,6 +457,8 @@ table.hupa-login-form {
.hupa-msgtable-row {
text-align: left;
=======
+=======
+>>>>>>> first commit
padding: 5px 4px 5px 4px;
background-color: #deeeff;
}
@@ -388,12 +474,16 @@ table.hupa-login-form {
.hupa-msgtable-row {
text-align: left;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
vertical-align: top;
padding: 0px 10px 0px 10px;
cursor: pointer;
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-msgtable-unseen {
font-weight: bold;
@@ -406,6 +496,8 @@ table.hupa-login-form {
}
=======
+=======
+>>>>>>> first commit
.hupa-msgtable-unseen {
font-weight: bold;
}
@@ -415,12 +507,16 @@ table.hupa-login-form {
text-align: center;
padding: 20px;
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
.hupa-search-box {
width: 150px;
}
<<<<<<< HEAD
+<<<<<<< HEAD
input[type=text],input[type=file],textarea {
background-color: #d8ecfd;
border: 1px solid #7FAAFF;
@@ -433,6 +529,8 @@ input[type=text],input[type=file],textar
.gwt-SuggestBoxPopup {
font-size: 10px;
=======
+=======
+>>>>>>> first commit
input[type=text], input[type=file], textarea {
background-color: #d8ecfd;
border: 1px solid #7FAAFF;
@@ -444,31 +542,43 @@ input[type=text], input[type=file], text
.gwt-SuggestBoxPopup {
font-size: 10px;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
}
.hupa-buttons .gwt-ListBox {
margin-left: 5px;
<<<<<<< HEAD
+<<<<<<< HEAD
padding-left: 3px;
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
}
/*************[ buttonbars ]*********************/
.hupa-buttons {
<<<<<<< HEAD
+<<<<<<< HEAD
white-space: nowrap;
}
.hupa-buttons td {
padding-left: 3px;
=======
+=======
+>>>>>>> first commit
white-space: nowrap;
}
.hupa-buttons td {
padding-left: 3px;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
}
@@ -477,25 +587,34 @@ input[type=text], input[type=file], text
vertical-align: middle;
}
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
.hupa-buttons .gwt-Hyperlink {
padding-left: 6px;
}
<<<<<<< HEAD
+<<<<<<< HEAD
/************[ widget: MessageHeaders ]*******************/
table.hupa-msg-headers {
background-color: #C3D9FF;
}
=======
+=======
+>>>>>>> first commit
/************[ widget: MessageHeaders ]*******************/
table.hupa-msg-headers {
background-color: #C3D9FF;
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
.hupa-msg-headers td.label {
width: 175px;
@@ -509,9 +628,12 @@ table.hupa-msgview {
width: 100%;
}
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
div.hupa-msgview-content {
padding: 20px;
}
@@ -525,12 +647,15 @@ div.hupa-msgview-content {
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-attachment-view {
margin-left: 10px;
}
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
/************[ view: MessageSendView ]*******************/
table.hupa-msgsend {
width: 100%;
@@ -538,12 +663,17 @@ table.hupa-msgsend {
.hupa-validate-error {
<<<<<<< HEAD
+<<<<<<< HEAD
border: 1pt solid red;
background-color: #fae5b0;
=======
border: 1pt solid red;
background-color: #fae5b0;
>>>>>>> first commit
+=======
+ border: 1pt solid red;
+ background-color: #fae5b0;
+>>>>>>> first commit
}
/************[ view: ContactsView ]*******************/
@@ -553,6 +683,10 @@ table.hupa-contacts {
}
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
=======
>>>>>>> first commit
@@ -563,6 +697,7 @@ table.hupa-contacts {
}
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-ErrorLabel,.gwt-PagingOptions .errorMessage {
color: #FF0000;
}
@@ -697,6 +832,8 @@ div.hupa-main {
max-height: 8px;
}
=======
+=======
+>>>>>>> first commit
.hupa-ErrorLabel, .gwt-PagingOptions .errorMessage {
color: #FF0000;
}
@@ -737,6 +874,10 @@ div.hupa-main {
}
/**** HTML5 shadows and gradients ****/
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
body {
background: #eaeaea;
}
@@ -780,6 +921,7 @@ div.hupa-main {
filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=1);
}
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> first commit
=======
@@ -817,3 +959,5 @@ div.hupa-main {
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 02:42:10 2013
@@ -19,16 +19,23 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<<<<<<< HEAD
+<<<<<<< HEAD
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
<link rel="Shortcut Icon" href="favicon.ico" type="image/x-icon"/>
<title>Hupa webmail</title>
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
=======
>>>>>>> first commit
@@ -43,6 +50,7 @@
position: absolute;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
top: 37%;
left: 50%;
}
@@ -63,6 +71,11 @@
display: none;
}
>>>>>>> constantly changed by manolo
+=======
+ top: 50%;
+ left: 50%;
+ }
+>>>>>>> first commit
</style>
</head>
@@ -70,6 +83,10 @@
<!-- oncontextmenu="return false;" -->
<body>
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
=======
>>>>>>> first commit
@@ -78,6 +95,7 @@
<div id="loading" class="loading">
<img src="images/hupa-spinning.gif">
<<<<<<< HEAD
+<<<<<<< HEAD
</div>
<!-- We need this because passwords in forms rendered by js are not saved in browsers -->
@@ -96,6 +114,8 @@
<input id="email" name="email" type="text">
<input id="password" name="password" type="password">
</form>
+=======
+>>>>>>> first commit
</div>
<!-- Necessary for history support -->
@@ -104,12 +124,17 @@
<!-- Download attachments needs this -->
<iframe src="" id="__download" style="width:0;height:0;border:0"></iframe>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
</body>
>>>>>>> first commit
+=======
+ </body>
+
+>>>>>>> first commit
<!-- load the application at the end when loading is being shown -->
<script type="text/javascript" language="javascript" src="hupa/hupa.nocache.js"></script>
Modified: james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml (original)
+++ james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml Thu Sep 12 02:42:10 2013
@@ -15,17 +15,23 @@
License.
-->
<<<<<<< HEAD
+<<<<<<< HEAD
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee">
=======
+=======
+>>>>>>> first commit
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
<!-- Max size of the upload request (10MB) -->
@@ -53,10 +59,14 @@
<listener>
<<<<<<< HEAD
+<<<<<<< HEAD
<listener-class>org.apache.hupa.server.ioc.GuiceListener</listener-class>
=======
<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
>>>>>>> first commit
+=======
+ <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
+>>>>>>> first commit
</listener>
<!-- Gwt remote logging -->
@@ -72,9 +82,12 @@
<!-- Default page to serve -->
<welcome-file-list>
<<<<<<< HEAD
+<<<<<<< HEAD
<welcome-file>index.jsp</welcome-file>
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
<welcome-file>Hupa.html</welcome-file>
</welcome-file-list>
Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java (original)
+++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java Thu Sep 12 02:42:10 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.mock;
<<<<<<< HEAD
+<<<<<<< HEAD
import gwtupload.client.IUploader;
import org.apache.hupa.client.activity.ComposeActivity.Displayable;
@@ -28,16 +29,21 @@ import org.apache.hupa.widgets.ui.HasEna
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasHTML;
import com.google.gwt.user.client.ui.HasText;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Widget;
public class MockMessageSendDisplay implements Displayable {
=======
+=======
+>>>>>>> first commit
import com.google.gwt.user.client.ui.Widget;
import gwtupload.client.IUploader;
@@ -47,6 +53,9 @@ import org.apache.hupa.shared.rpc.Contac
import org.apache.hupa.widgets.ui.HasEnable;
public class MockMessageSendDisplay implements Display {
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
HasClickHandlers backClick = new MockWidget();
@@ -86,11 +95,17 @@ public class MockMessageSendDisplay impl
}
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
=======
+>>>>>>> first commit
public HasText getFromText() {
return fromText;
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
public HasHTML getMessageHTML() {
return messageHtml;
@@ -151,6 +166,7 @@ public class MockMessageSendDisplay impl
}
<<<<<<< HEAD
+<<<<<<< HEAD
@Override
public void showCc() {
// TODO Auto-generated method stub
@@ -303,4 +319,6 @@ public class MockMessageSendDisplay impl
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
}
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.mock;
<<<<<<< HEAD
+<<<<<<< HEAD
import gwtupload.client.IFileInput;
import gwtupload.client.IUploadStatus;
import gwtupload.client.IUploadStatus.Status;
@@ -32,6 +33,8 @@ import com.google.gwt.event.shared.Handl
import com.google.gwt.user.client.ui.Widget;
=======
+=======
+>>>>>>> first commit
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.Widget;
@@ -44,6 +47,9 @@ import gwtupload.client.IUploader.Upload
import java.util.Iterator;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
public class MockUploader implements IUploader {
@@ -134,10 +140,14 @@ public class MockUploader implements IUp
}
<<<<<<< HEAD
+<<<<<<< HEAD
public void setValidExtensions(String... ext) {
=======
public void setValidExtensions(String[] ext) {
>>>>>>> first commit
+=======
+ public void setValidExtensions(String[] ext) {
+>>>>>>> first commit
// TODO Auto-generated method stub
}
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -32,9 +32,12 @@ public class EmailListValidatorTest exte
assertTrue(EmailListValidator.isValidAddressList("abc@abc.def ; ; MMM <mc...@aa.co>;;;"));
assertTrue(EmailListValidator.isValidAddressList("abc@abc.def\nMMM <mc...@aa.co>;;;"));
<<<<<<< HEAD
+<<<<<<< HEAD
assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail.com@james.apache.org"));
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
}
}
Modified: james/hupa/trunk/mock/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu Sep 12 02:42:10 2013
@@ -19,6 +19,7 @@
-->
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -26,23 +27,32 @@
<artifactId>hupa-parent</artifactId>
<version>0.0.3-SNAPSHOT</version>
=======
+=======
+>>>>>>> first commit
<project
xmlns="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">
+<<<<<<< HEAD
=======
<project xmlns="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">
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<<<<<<< HEAD
+<<<<<<< HEAD
<version>0.0.2-SNAPSHOT</version>
>>>>>>> first commit
=======
<version>0.0.3-SNAPSHOT</version>
>>>>>>> constantly changed by manolo
+=======
+ <version>0.0.2-SNAPSHOT</version>
+>>>>>>> first commit
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa-mock</artifactId>
@@ -52,10 +62,14 @@
<dependencies>
<dependency>
<<<<<<< HEAD
+<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
=======
<groupId>org.apache.hupa</groupId>
>>>>>>> first commit
+=======
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-shared</artifactId>
</dependency>
<dependency>
@@ -94,12 +108,18 @@
</dependency>
<dependency>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
+=======
+>>>>>>> first commit
<groupId>net.customware.gwt.dispatch
</groupId>
<artifactId>gwt-dispatch</artifactId>
</dependency>
<dependency>
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
<groupId>com.googlecode.gwtupload</groupId>
<artifactId>gwtupload</artifactId>
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -22,16 +22,22 @@ package org.apache.hupa.server.guice;
import java.util.Properties;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
import com.google.inject.AbstractModule;
=======
+=======
+>>>>>>> first commit
import net.customware.gwt.dispatch.server.guice.ActionHandlerModule;
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -82,15 +88,21 @@ import com.google.inject.name.Named;
*
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public abstract class AbstractGuiceTestModule extends AbstractModule{
protected static class TestUser extends UserImpl {
=======
+=======
+>>>>>>> first commit
public abstract class AbstractGuiceTestModule extends ActionHandlerModule {
protected static class TestUser extends User {
private static final long serialVersionUID = 1L;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
@Inject
public TestUser(@Named("Username") String username,
@@ -102,11 +114,16 @@ public abstract class AbstractGuiceTestM
setName(username);
setPassword(password);
<<<<<<< HEAD
+<<<<<<< HEAD
setSettings(new SettingsImpl() {
=======
setSettings(new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ setSettings(new Settings() {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
{
setInboxFolderName(inbox);
setSentFolderName(sent);
@@ -136,16 +153,22 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
=======
+>>>>>>> first commit
put("TrustStore", "my-truststore");
put("TrustStorePassword", "my-truststore-password");
put("IMAPConnectionPoolSize", "4");
put("IMAPConnectionPoolTimeout", "300000");
+<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "Trash");
put("DefaultSentFolder", "Sent");
@@ -153,12 +176,17 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
put("PostFetchMessageCount", "0");
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+ put("PostFetchMessageCount", "0");
+
+>>>>>>> first commit
put("SMTPServerAddress", "localhost");
put("SMTPServerPort", "25");
put("SMTPS", "false");
@@ -166,6 +194,7 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
put("SessionDebug", "true");
=======
put("SessionDebug", "false");
@@ -175,6 +204,11 @@ public abstract class AbstractGuiceTestM
=======
put("SessionDebug", "true");
>>>>>>> constantly changed by manolo
+=======
+ put("SessionDebug", "false");
+
+ put("DefaultUserSessionId", "just_an_id");
+>>>>>>> first commit
}
};
@@ -196,16 +230,22 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
=======
+>>>>>>> first commit
put("TrustStore", "my-truststore");
put("TrustStorePassword", "my-truststore-password");
put("IMAPConnectionPoolSize", "4");
put("IMAPConnectionPoolTimeout", "300000");
+<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "INBOX.Trash");
put("DefaultSentFolder", "INBOX.Sent");
@@ -213,12 +253,17 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
put("PostFetchMessageCount", "0");
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+ put("PostFetchMessageCount", "0");
+
+>>>>>>> first commit
put("SMTPServerAddress", "mail.hotelsearch.com");
put("SMTPServerPort", "25");
put("SMTPS", "false");
@@ -226,6 +271,7 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
put("SessionDebug", "true");
=======
put("SessionDebug", "false");
@@ -235,6 +281,11 @@ public abstract class AbstractGuiceTestM
=======
put("SessionDebug", "true");
>>>>>>> constantly changed by manolo
+=======
+ put("SessionDebug", "false");
+
+ put("DefaultUserSessionId", "just_an_id");
+>>>>>>> first commit
}
};
@@ -255,6 +306,7 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
put("TrustStore", "my-truststore");
put("TrustStorePassword", "my-truststore-password");
@@ -262,6 +314,11 @@ public abstract class AbstractGuiceTestM
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+ put("TrustStore", "my-truststore");
+ put("TrustStorePassword", "my-truststore-password");
+
+>>>>>>> first commit
put("IMAPConnectionPoolSize", "4");
put("IMAPConnectionPoolTimeout", "300000");
@@ -272,12 +329,17 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
put("PostFetchMessageCount", "0");
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+ put("PostFetchMessageCount", "0");
+
+>>>>>>> first commit
put("SMTPServerAddress", "smtp.gmail.com");
put("SMTPServerPort", "465");
put("SMTPS", "true");
@@ -285,6 +347,7 @@ public abstract class AbstractGuiceTestM
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
put("SessionDebug", "true");
=======
put("SessionDebug", "false");
@@ -294,6 +357,11 @@ public abstract class AbstractGuiceTestM
=======
put("SessionDebug", "true");
>>>>>>> constantly changed by manolo
+=======
+ put("SessionDebug", "false");
+
+ put("DefaultUserSessionId", "just_an_id");
+>>>>>>> first commit
}
};
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java Thu Sep 12 02:42:10 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.server.mock;
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.Properties;
import org.apache.hupa.shared.data.SettingsImpl;
@@ -27,10 +28,15 @@ import org.apache.hupa.shared.data.UserI
import org.apache.hupa.shared.domain.Settings;
import org.apache.hupa.shared.domain.User;
=======
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import java.util.Properties;
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
/**
@@ -39,6 +45,7 @@ import java.util.Properties;
public class MockConstants {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public static String SESSION_ID = "MockID";
@@ -52,6 +59,11 @@ public class MockConstants {
public final static Settings mockSettings = new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+
+ public final static Settings mockSettings = new Settings() {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
{
setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
@@ -67,11 +79,15 @@ public class MockConstants {
put("Password", MockIMAPStore.MOCK_LOGIN);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
put("DefaultUserSessionId", "DEMO_ID");
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+ put("DefaultUserSessionId", "DEMO_ID");
+>>>>>>> first commit
put("IMAPServerAddress", MockIMAPStore.MOCK_HOST);
put("SMTPServerAddress", MockIMAPStore.MOCK_HOST);
@@ -88,11 +104,16 @@ public class MockConstants {
};
<<<<<<< HEAD
+<<<<<<< HEAD
public final static Settings mockUserSettings = new SettingsImpl() {
=======
public final static Settings mockUserSettings = new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ public final static Settings mockUserSettings = new Settings() {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
{
setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
@@ -102,11 +123,16 @@ public class MockConstants {
};
<<<<<<< HEAD
+<<<<<<< HEAD
public final static User mockUser = new UserImpl() {
=======
public final static User mockUser = new User() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ public final static User mockUser = new User() {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
{
setName(MockIMAPStore.MOCK_LOGIN);
setPassword(MockIMAPStore.MOCK_LOGIN);
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java Thu Sep 12 02:42:10 2013
@@ -32,11 +32,15 @@ import javax.servlet.http.HttpSessionCon
import com.google.inject.Inject;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import com.google.inject.name.Named;
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+import com.google.inject.name.Named;
+>>>>>>> first commit
@SuppressWarnings("deprecation")
public class MockHttpSession implements HttpSession{
@@ -49,6 +53,7 @@ public class MockHttpSession implements
@Inject
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public MockHttpSession() {
cTime = System.currentTimeMillis();
this.id = MockConstants.SESSION_ID + "-" + seq++;
@@ -62,6 +67,11 @@ public class MockHttpSession implements
cTime = System.currentTimeMillis();
this.id = MockConstants.SESSION_ID + "-" + seq++;
>>>>>>> constantly changed by manolo
+=======
+ public MockHttpSession(@Named("DefaultUserSessionId") String id) {
+ cTime = System.currentTimeMillis();
+ this.id = id + "-" + seq++;
+>>>>>>> first commit
}
public Object getAttribute(String name) {
@@ -70,12 +80,17 @@ public class MockHttpSession implements
<<<<<<< HEAD
+<<<<<<< HEAD
@SuppressWarnings("rawtypes")
public Enumeration getAttributeNames() {
=======
@SuppressWarnings("unchecked")
public Enumeration getAttributeNames() {
>>>>>>> first commit
+=======
+ @SuppressWarnings("unchecked")
+ public Enumeration getAttributeNames() {
+>>>>>>> first commit
return new Enumeration() {
Iterator it = attributeMap.keySet().iterator();
public boolean hasMoreElements() {
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java Thu Sep 12 02:42:10 2013
@@ -20,16 +20,20 @@ package org.apache.hupa.server.mock;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.servlet.http.HttpSession;
import com.google.inject.Inject;
import com.google.inject.Provider;
=======
+=======
+>>>>>>> first commit
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.name.Named;
import javax.servlet.http.HttpSession;
+<<<<<<< HEAD
>>>>>>> first commit
=======
import javax.servlet.http.HttpSession;
@@ -37,6 +41,8 @@ import javax.servlet.http.HttpSession;
import com.google.inject.Inject;
import com.google.inject.Provider;
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
public class MockHttpSessionProvider implements Provider<HttpSession> {
@@ -44,6 +50,7 @@ public class MockHttpSessionProvider imp
@Inject
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public MockHttpSessionProvider() {
if (session == null) {
session = new MockHttpSession();
@@ -57,6 +64,11 @@ public class MockHttpSessionProvider imp
if (session == null) {
session = new MockHttpSession();
>>>>>>> constantly changed by manolo
+=======
+ public MockHttpSessionProvider(@Named("DefaultUserSessionId") String id) {
+ if (session == null) {
+ session = new MockHttpSession(id);
+>>>>>>> first commit
}
}
public HttpSession get() {
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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java Thu Sep 12 02:42:10 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.server.mock;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
@@ -28,6 +29,11 @@ import com.sun.mail.imap.IMAPStore;
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+import com.sun.mail.imap.IMAPFolder;
+import com.sun.mail.imap.IMAPStore;
+
+>>>>>>> first commit
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -37,12 +43,15 @@ import javax.mail.FetchProfile;
import javax.mail.Flags;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
=======
>>>>>>> first commit
=======
import javax.mail.Flags.Flag;
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
@@ -50,6 +59,7 @@ import javax.mail.Session;
import javax.mail.Store;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
@@ -57,10 +67,13 @@ import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
=======
+=======
+>>>>>>> first commit
import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
+<<<<<<< HEAD
>>>>>>> first commit
=======
import javax.mail.internet.MimeMessage;
@@ -70,6 +83,8 @@ import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
public class MockIMAPFolder extends IMAPFolder {
public static final char SEPARATOR = '.';
@@ -290,6 +305,7 @@ public class MockIMAPFolder extends IMAP
@Override
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public synchronized Message[] search(SearchTerm search)
throws MessagingException {
checkExists();
@@ -301,10 +317,13 @@ public class MockIMAPFolder extends IMAP
}
return ret.toArray(new Message[0]);
=======
+=======
+>>>>>>> first commit
public synchronized Message[] search(SearchTerm arg0)
throws MessagingException {
checkExists();
return getMessages();
+<<<<<<< HEAD
>>>>>>> first commit
=======
public synchronized Message[] search(SearchTerm search)
@@ -318,6 +337,8 @@ public class MockIMAPFolder extends IMAP
}
return ret.toArray(new Message[0]);
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
}
@Override
@@ -359,17 +380,23 @@ public class MockIMAPFolder extends IMAP
for (int i = 0; i < ints.length; i++) {
<<<<<<< HEAD
+<<<<<<< HEAD
int mInt = ints[i];
if (mInt > messages.size() || mInt < 0) {
throw new MessagingException();
}
array[i] = messages.get(ints[i]);
=======
+=======
+>>>>>>> first commit
int mInt = ints[i] - 1;
if (mInt > messages.size() || mInt < messages.size()) {
throw new MessagingException();
}
array[i] = messages.get(i);
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
}
return array;
Modified: james/hupa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Sep 12 02:42:10 2013
@@ -19,16 +19,22 @@
-->
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<project xmlns="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">
=======
+=======
+>>>>>>> first commit
<project
xmlns="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">
+<<<<<<< HEAD
>>>>>>> first commit
=======
<project xmlns="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">
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
@@ -36,6 +42,7 @@
<version>1.8.1</version>
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> constantly changed by manolo
<relativePath />
@@ -45,14 +52,19 @@
<version>0.0.3-SNAPSHOT</version>
<<<<<<< HEAD
=======
+=======
+>>>>>>> first commit
<relativePath></relativePath>
</parent>
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
+<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
<packaging>pom</packaging>
<name>Apache James Hupa Parent</name>
<description>Hupa is a GWT based Webmail</description>
@@ -60,12 +72,17 @@
<inceptionYear>2009</inceptionYear>
<modules>
<<<<<<< HEAD
+<<<<<<< HEAD
<module>shared</module>
<module>mock</module>
=======
<module>mock</module>
<module>shared</module>
>>>>>>> first commit
+=======
+ <module>mock</module>
+ <module>shared</module>
+>>>>>>> first commit
<module>server</module>
<module>widgets</module>
<module>client</module>
@@ -87,6 +104,7 @@
</distributionManagement>
<properties>
<<<<<<< HEAD
+<<<<<<< HEAD
<gwtVersion>2.5.1</gwtVersion>
<gwtMavenVersion>2.5.1</gwtMavenVersion>
<gwt.moduleSuffix />
@@ -173,35 +191,55 @@
</profile>
</profiles>
+=======
+ <gwtVersion>2.4.0</gwtVersion>
+ <gwtMavenVersion>2.4.0</gwtMavenVersion>
+ <jettyVersion>7.3.0.v20110203</jettyVersion>
+ </properties>
+>>>>>>> first commit
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-mock</artifactId>
<version>${project.version}</version>
+<<<<<<< HEAD
<scope>${mock.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.hupa</groupId>
>>>>>>> first commit
+=======
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<<<<<<< HEAD
+<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
=======
<groupId>org.apache.hupa</groupId>
>>>>>>> first commit
+=======
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-shared</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<<<<<<< HEAD
+<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
=======
<groupId>org.apache.hupa</groupId>
>>>>>>> first commit
+=======
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-widgets</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: james/hupa/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Thu Sep 12 02:42:10 2013
@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> constantly changed by manolo
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -163,6 +164,8 @@
</project>
<<<<<<< HEAD
=======
+=======
+>>>>>>> first commit
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -302,6 +305,9 @@
</plugins>
</build>
</project>
+<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java Thu Sep 12 02:42:10 2013
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -20,6 +21,8 @@
=======
>>>>>>> first commit
+=======
+>>>>>>> first commit
package org.apache.hupa.server;
import javax.mail.MessagingException;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java Thu Sep 12 02:42:10 2013
@@ -25,10 +25,14 @@ import javax.mail.Session;
import javax.mail.Transport;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
=======
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.sun.mail.imap.IMAPStore;
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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java Thu Sep 12 02:42:10 2013
@@ -30,10 +30,14 @@ import javax.mail.Transport;
import org.apache.commons.logging.Log;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
=======
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -98,6 +102,7 @@ public class InMemoryIMAPStoreCache impl
public IMAPStore get(User user) throws MessagingException {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> constantly changed by manolo
IMAPStore ret = get(user.getName(),user.getPassword());
@@ -113,6 +118,9 @@ public class InMemoryIMAPStoreCache impl
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+ return get(user.getName(),user.getPassword());
+>>>>>>> first commit
}
/*
@@ -147,7 +155,10 @@ public class InMemoryIMAPStoreCache impl
if (cstore.getStore().isConnected() == false) {
try {
cstore.getStore().connect(address, port, username, password);
+<<<<<<< HEAD
System.out.println(address +"ImMemory"+ port);
+=======
+>>>>>>> first commit
} catch (MessagingException e) {
throw (e);
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java Thu Sep 12 02:42:10 2013
@@ -22,6 +22,10 @@ package org.apache.hupa.server.guice;
import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+import org.apache.hupa.server.servlet.HupaDispatchServlet;
+>>>>>>> first commit
=======
import org.apache.hupa.server.servlet.HupaDispatchServlet;
>>>>>>> first commit
@@ -36,6 +40,10 @@ public class DispatchServletModule exten
@Override
public void configureServlets() {
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ serve("/" + SConsts.HUPA + SConsts.SERVLET_DISPATCH).with(HupaDispatchServlet.class );
+>>>>>>> first commit
=======
serve("/" + SConsts.HUPA + SConsts.SERVLET_DISPATCH).with(HupaDispatchServlet.class );
>>>>>>> first commit
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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java Thu Sep 12 02:42:10 2013
@@ -106,7 +106,11 @@ public class GuiceServletConfig extends
if (demoHostName == null || System.getProperty(demoHostName) == null) {
List<String> configurationList = new ArrayList<String>();
configurationList.add(System.getProperty(SYS_PROP_CONFIG_FILE));
+<<<<<<< HEAD
configurationList.add(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME);
+=======
+ configurationList.add(System.getProperty(System.getenv("HOME") + "/.hupa/" + CONFIG_FILE_NAME));
+>>>>>>> first commit
configurationList.add("/etc/default/hupa");
configurationList.add(servletContextRealPath + "/" + CONFIG_DIR_IN_WAR + CONFIG_FILE_NAME);
Copied: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/JavaMailSessionProvider.java (from r1522129, james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java)
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/JavaMailSessionProvider.java?p2=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/JavaMailSessionProvider.java&p1=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java&r1=1522129&r2=1522132&rev=1522132&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/JavaMailSessionProvider.java Thu Sep 12 02:42:10 2013
@@ -1,35 +1,34 @@
-/****************************************************************
- * 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.rpc;
-
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
-
-public class DeleteAllMessages extends DeleteMessage{
-
- private static final long serialVersionUID = -6801849429581798842L;
-
- public DeleteAllMessages(IMAPFolderProxy folder) {
- super(folder);
- }
-
- protected DeleteAllMessages() {
-
- }
-}
+/****************************************************************
+ * 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;
+
+import java.util.Properties;
+
+import javax.mail.Session;
+
+import com.google.inject.Provider;
+
+public class JavaMailSessionProvider implements Provider<Session>{
+
+ public Session get() {
+ Session session = Session.getDefaultInstance(new Properties(), null);
+ return session;
+ }
+}
Copied: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/LogProvider.java (from r1522129, 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/LogProvider.java?p2=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/LogProvider.java&p1=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java&r1=1522129&r2=1522132&rev=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/LogProvider.java Thu Sep 12 02:42:10 2013
@@ -17,11 +17,8 @@
* under the License. *
****************************************************************/
-<<<<<<< HEAD
-=======
->>>>>>> first commit
-package org.apache.hupa.server.guice.providers;
+package org.apache.hupa.server.guice;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.Log4JLogger;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java Thu Sep 12 02:42:10 2013
@@ -20,11 +20,15 @@
package org.apache.hupa.server.guice.providers;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.domain.Settings;
=======
import org.apache.hupa.shared.data.Settings;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Settings;
+>>>>>>> first commit
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -52,10 +56,14 @@ public class DefaultUserSettingsProvider
*/
public Settings get() {
<<<<<<< HEAD
+<<<<<<< HEAD
Settings settings = new SettingsImpl();
=======
Settings settings = new Settings();
>>>>>>> first commit
+=======
+ Settings settings = new Settings();
+>>>>>>> first commit
settings.setInboxFolderName(inboxFolder);
settings.setSentFolderName(sentFolder);
settings.setTrashFolderName(trashFolder);
Modified: 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=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java Thu Sep 12 02:42:10 2013
@@ -18,6 +18,10 @@
****************************************************************/
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
=======
>>>>>>> first commit
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java Thu Sep 12 02:42:10 2013
@@ -30,7 +30,10 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -58,7 +61,11 @@ public abstract class AbstractDeleteMess
*/
public DeleteMessageResult executeInternal(Action action,
ExecutionContext context) throws ActionException {
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
+=======
+ org.apache.hupa.shared.data.IMAPFolder folder = action.getFolder();
+>>>>>>> first commit
User user = getUser();
try {
IMAPStore store = cache.get(user);
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=1522132&r1=1522131&r2=1522132&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 Sep 12 02:42:10 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.server.handler;
+<<<<<<< HEAD
import java.io.IOException;
import java.util.ArrayList;
@@ -31,6 +32,11 @@ import javax.mail.Part;
import javax.mail.UIDFolder;
import javax.mail.internet.MimeMessage.RecipientType;
import javax.servlet.http.HttpSession;
+=======
+import com.google.inject.Provider;
+
+import com.sun.mail.imap.IMAPStore;
+>>>>>>> first commit
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
@@ -38,6 +44,7 @@ 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;
+<<<<<<< HEAD
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message.IMAPFlag;
@@ -49,6 +56,28 @@ import org.apache.hupa.shared.rpc.FetchM
import com.google.inject.Provider;
import com.sun.mail.imap.IMAPStore;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+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.internet.MimeUtility;
+import javax.mail.internet.MimeMessage.RecipientType;
+import javax.servlet.http.HttpSession;
+>>>>>>> first commit
public abstract class AbstractFetchMessagesHandler <A extends FetchMessages> extends AbstractSessionHandler<A, FetchMessagesResult>{
@@ -63,9 +92,15 @@ public abstract class AbstractFetchMessa
protected FetchMessagesResult executeInternal(A action,
ExecutionContext context) throws ActionException {
User user = getUser();
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
if (folder == null) {
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
+=======
+ IMAPFolder folder = action.getFolder();
+ if (folder == null) {
+ folder = new IMAPFolder(user.getSettings().getInboxFolderName());
+>>>>>>> first commit
}
com.sun.mail.imap.IMAPFolder f = null;
int start = action.getStart();
@@ -118,7 +153,10 @@ public abstract class AbstractFetchMessa
fp.add(FetchProfile.Item.ENVELOPE);
fp.add(FetchProfile.Item.FLAGS);
fp.add(FetchProfile.Item.CONTENT_INFO);
+<<<<<<< HEAD
fp.add(UIDFolder.FetchProfileItem.UID);
+=======
+>>>>>>> first commit
folder.fetch(messages, fp);
// loop over the fetched messages
@@ -127,13 +165,33 @@ public abstract class AbstractFetchMessa
Message m = messages[i];
String from = null;
if (m.getFrom() != null && m.getFrom().length >0 ) {
+<<<<<<< HEAD
from = MessageUtils.decodeText(m.getFrom()[0].toString());
+=======
+ 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());
+ }
+>>>>>>> first commit
}
msg.setFrom(from);
String replyto = null;
if (m.getReplyTo() != null && m.getReplyTo().length >0 ) {
+<<<<<<< HEAD
replyto = MessageUtils.decodeText(m.getReplyTo()[0].toString());
+=======
+ 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());
+ }
+>>>>>>> first commit
}
msg.setReplyto(replyto);
@@ -142,8 +200,20 @@ public abstract class AbstractFetchMessa
Address[] toArray = m.getRecipients(RecipientType.TO);
if (toArray != null) {
for (Address addr : toArray) {
+<<<<<<< HEAD
String mailTo = MessageUtils.decodeText(addr.toString());
to.add(mailTo);
+=======
+ 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);
+>>>>>>> first commit
}
}
msg.setTo(to);
@@ -151,7 +221,15 @@ public abstract class AbstractFetchMessa
// Check if a subject exist and if so decode it
String subject = m.getSubject();
if (subject != null) {
+<<<<<<< HEAD
subject = MessageUtils.decodeText(subject);
+=======
+ try {
+ subject = MimeUtility.decodeText(subject);
+ } catch (UnsupportedEncodingException e) {
+ logger.debug("Unable to decode subject " + subject + " " + e.getMessage());
+ }
+>>>>>>> first commit
}
msg.setSubject(subject);
@@ -160,17 +238,32 @@ public abstract class AbstractFetchMessa
ArrayList<String> cc = new ArrayList<String>();
if (ccArray != null) {
for (Address addr : ccArray) {
+<<<<<<< HEAD
String mailCc = MessageUtils.decodeText(addr.toString());
cc.add(mailCc);
+=======
+ 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);
+>>>>>>> first commit
}
}
msg.setCc(cc);
+<<<<<<< HEAD
userPreferences.addContact(from);
userPreferences.addContact(to);
userPreferences.addContact(replyto);
userPreferences.addContact(cc);
+=======
+>>>>>>> first commit
// Using sentDate since received date is not useful in the view when using fetchmail
msg.setReceivedDate(m.getSentDate());
@@ -245,6 +338,9 @@ public abstract class AbstractFetchMessa
return messages;
}
}
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
}
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -147,7 +147,11 @@ public abstract class AbstractSendMessag
message.setRecipients(RecipientType.TO, MessageUtils.getRecipients(m.getTo()));
message.setRecipients(RecipientType.CC, MessageUtils.getRecipients(m.getCc()));
message.setRecipients(RecipientType.BCC, MessageUtils.getRecipients(m.getBcc()));
+<<<<<<< HEAD
message.setSubject(MessageUtils.encodeTexts(m.getSubject()));
+=======
+ message.setSubject(m.getSubject());
+>>>>>>> first commit
message.saveChanges();
return message;
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java Thu Sep 12 02:42:10 2013
@@ -27,8 +27,13 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -53,7 +58,11 @@ public class DeleteFolderHandler extends
protected GenericResult executeInternal(DeleteFolder action,
ExecutionContext context) throws ActionException {
User user = getUser();
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
+=======
+ IMAPFolder folder = action.getFolder();
+>>>>>>> first commit
try {
IMAPStore store = cache.get(user);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java Thu Sep 12 02:42:10 2013
@@ -30,8 +30,13 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import com.google.inject.Inject;
@@ -63,7 +68,11 @@ public class DeleteMessageByUidHandler e
@Override
protected Message[] getMessagesToDelete(DeleteMessageByUid action)
throws ActionException {
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
+=======
+ IMAPFolder folder = action.getFolder();
+>>>>>>> first commit
ArrayList<Long> uids = action.getMessageUids();
User user = getUser();
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java Thu Sep 12 02:42:10 2013
@@ -33,7 +33,10 @@ import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
@@ -66,11 +69,19 @@ public class FetchFoldersHandler extends
com.sun.mail.imap.IMAPFolder folder = (com.sun.mail.imap.IMAPFolder) store.getDefaultFolder();
// List of mail 'root' imap folders
+<<<<<<< HEAD
List<IMAPFolderProxy> imapFolders = new ArrayList<IMAPFolderProxy>();
// Create IMAPFolder tree list
for (Folder f : folder.list()) {
IMAPFolderProxy imapFolder = createIMAPFolder(f);
+=======
+ List<IMAPFolder> imapFolders = new ArrayList<IMAPFolder>();
+
+ // Create IMAPFolder tree list
+ for (Folder f : folder.list()) {
+ IMAPFolder imapFolder = createIMAPFolder(f);
+>>>>>>> first commit
imapFolders.add(imapFolder);
walkFolders(f, imapFolder);
}
@@ -96,9 +107,15 @@ public class FetchFoldersHandler extends
* @throws ActionException If an error occurs
* @throws MessagingException If an error occurs
*/
+<<<<<<< HEAD
private void walkFolders(Folder folder, IMAPFolderProxy imapFolder) throws ActionException, MessagingException{
for (Folder f : folder.list()) {
IMAPFolderProxy iFolder = createIMAPFolder(f);
+=======
+ private void walkFolders(Folder folder, IMAPFolder imapFolder) throws ActionException, MessagingException{
+ for (Folder f : folder.list()) {
+ IMAPFolder iFolder = createIMAPFolder(f);
+>>>>>>> first commit
imapFolder.getChildIMAPFolders().add(iFolder);
walkFolders(f, iFolder);
}
@@ -119,16 +136,28 @@ public class FetchFoldersHandler extends
* @throws ActionException If an error occurs
* @throws MessagingException If an error occurs
*/
+<<<<<<< HEAD
private IMAPFolderProxy createIMAPFolder(Folder folder) throws ActionException {
String fullName = folder.getFullName();
String delimiter;
IMAPFolderProxy iFolder = null;
+=======
+ private IMAPFolder createIMAPFolder(Folder folder) throws ActionException {
+
+ String fullName = folder.getFullName();
+ String delimiter;
+ IMAPFolder iFolder = null;
+>>>>>>> first commit
try {
logger.debug("Creating folder: " + fullName + " for user: " + getUser());
delimiter = String.valueOf(folder.getSeparator());
+<<<<<<< HEAD
iFolder = (IMAPFolderProxy)new IMAPFolder(fullName);
+=======
+ iFolder = new IMAPFolder(fullName);
+>>>>>>> first commit
iFolder.setDelimiter(delimiter);
if("[Gmail]".equals(folder.getFullName()))
return iFolder;
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=1522132&r1=1522131&r2=1522132&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 Sep 12 02:42:10 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.server.handler;
+<<<<<<< HEAD
import static org.apache.hupa.server.utils.RegexPatterns.regex_badAttrs;
import static org.apache.hupa.server.utils.RegexPatterns.regex_badTags;
import static org.apache.hupa.server.utils.RegexPatterns.regex_email;
@@ -44,16 +45,25 @@ import static org.apache.hupa.server.uti
import static org.apache.hupa.server.utils.RegexPatterns.replaceAll;
import static org.apache.hupa.server.utils.RegexPatterns.replaceAllRecursive;
+=======
+>>>>>>> first commit
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import javax.mail.Flags;
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
+=======
+>>>>>>> first commit
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
+<<<<<<< HEAD
+=======
+import javax.mail.Flags.Flag;
+>>>>>>> first commit
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;
import javax.servlet.http.HttpSession;
@@ -63,10 +73,18 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import static org.apache.hupa.server.utils.RegexPatterns.*;
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.MessageAttachment;
+import org.apache.hupa.shared.data.MessageDetails;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.GetMessageDetails;
import org.apache.hupa.shared.rpc.GetMessageDetailsResult;
@@ -105,7 +123,11 @@ public class GetMessageDetailsHandler ex
return GetMessageDetails.class;
}
+<<<<<<< HEAD
protected MessageDetails exposeMessage(User user, IMAPFolderProxy folder,
+=======
+ protected MessageDetails exposeMessage(User user, IMAPFolder folder,
+>>>>>>> first commit
long uid) throws ActionException {
IMAPStore store = null;
com.sun.mail.imap.IMAPFolder f = null;
@@ -190,7 +212,11 @@ public class GetMessageDetailsHandler ex
IOException {
boolean isHTML = false;
if (con instanceof String) {
+<<<<<<< HEAD
if (message.getContentType().toLowerCase().startsWith("text/html")) {
+=======
+ if (message.getContentType().startsWith("text/html")) {
+>>>>>>> first commit
isHTML = true;
} else {
isHTML = false;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java Thu Sep 12 02:42:10 2013
@@ -25,10 +25,14 @@ import javax.mail.Flags;
import javax.mail.Flags.Flag;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
=======
import org.apache.hupa.shared.data.Message.IMAPFlag;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Message.IMAPFlag;
+>>>>>>> first commit
/**
* Util class which helps to convert from hupa internal data representation to javamaill classes
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java Thu Sep 12 02:42:10 2013
@@ -22,10 +22,17 @@ package org.apache.hupa.server.handler;
import java.util.ArrayList;
import javax.mail.Flags;
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
+=======
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Flags.Flag;
+>>>>>>> first commit
import javax.servlet.http.HttpSession;
import net.customware.gwt.dispatch.server.ExecutionContext;
@@ -33,8 +40,13 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.GenericResult;
import org.apache.hupa.shared.rpc.SetFlag;
@@ -54,7 +66,11 @@ public class SetFlagsHandler extends Abs
protected GenericResult executeInternal(SetFlag action,
ExecutionContext context) throws ActionException {
User user = getUser();
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
+=======
+ IMAPFolder folder = action.getFolder();
+>>>>>>> first commit
ArrayList<Long> uids = action.getUids();
com.sun.mail.imap.IMAPFolder f = null;
try {
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java Thu Sep 12 02:42:10 2013
@@ -49,10 +49,14 @@ import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.server.utils.MessageUtils;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
=======
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
import com.google.inject.Inject;
@@ -68,12 +72,15 @@ import com.sun.mail.imap.IMAPStore;
public class InImapUserPreferencesStorage extends UserPreferencesStorage {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> first commit
// User preferences are saved in IMAP but there is a delay between a new
// contact is added an the save action. It saves number of operations in
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -25,11 +25,15 @@ import java.util.Arrays;
import java.util.List;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import java.util.regex.Pattern;
>>>>>>> first commit
=======
>>>>>>> constant changed by manolo
+=======
+import java.util.regex.Pattern;
+>>>>>>> first commit
/**
*
@@ -66,7 +70,11 @@ public abstract class UserPreferencesSto
final public void addContact(List<String> mails) {
if (mails != null) {
for (String mail: mails) {
+<<<<<<< HEAD
if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
+=======
+ if (!mail.matches(REGEX_OMITTED_EMAILS)) {
+>>>>>>> first commit
Contact contact = new Contact(mail);
addContact(contact);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org