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 03:59:37 UTC
svn commit: r1522101 [1/2] - in /james/hupa/trunk: ./
client/src/main/java/org/apache/hupa/client/
client/src/main/java/org/apache/hupa/client/rf/
client/src/main/java/org/apache/hupa/client/validation/
client/src/main/java/org/apache/hupa/client/widge...
Author: dongxu
Date: Thu Sep 12 01:59:36 2013
New Revision: 1522101
URL: http://svn.apache.org/r1522101
Log:
first commit
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
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/WEB-INF/web.xml
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
james/hupa/trunk/mock/pom.xml
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/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
james/hupa/trunk/pom.xml
james/hupa/trunk/server/pom.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
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/DispatchServletModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.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/UserPreferencesStorage.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/utils/ConfigurationProperties.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/RegexPatterns.java
james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.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/guice/ServerModulTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java
james/hupa/trunk/shared/pom.xml
james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoginEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
james/hupa/trunk/src/site/resources/demo/index.html
james/hupa/trunk/src/site/xdoc/index.xml
james/hupa/trunk/widgets/pom.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java Thu Sep 12 01:59:36 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client;
+<<<<<<< HEAD
import org.apache.hupa.client.ioc.AppGinjector;
import com.google.gwt.core.client.EntryPoint;
@@ -53,5 +54,34 @@ public class Hupa implements EntryPoint
}
private final AppGinjector injector = GWT.create(AppGinjector.class);
+=======
+import net.customware.gwt.presenter.client.place.PlaceManager;
+
+import org.apache.hupa.client.gin.HupaGinjector;
+import org.apache.hupa.client.mvp.AppPresenter;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.ui.RootPanel;
+
+public class Hupa implements EntryPoint{
+ private final HupaGinjector injector = GWT.create(HupaGinjector.class);
+
+ public void onModuleLoad() {
+ // remove the loading message from the browser
+ com.google.gwt.user.client.Element loading = DOM.getElementById("loading");
+
+ DOM.removeChild(RootPanel.getBodyElement(), loading);
+
+ AppPresenter aPres = injector.getAppPresenter();
+ aPres.bind();
+
+ RootPanel.get().add(aPres.getDisplay().asWidget());
+
+ PlaceManager placeManager = injector.getPlaceManager();
+ placeManager.fireCurrentPlace();
+ }
+>>>>>>> first commit
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java?rev=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java Thu Sep 12 01:59:36 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.rf;
import com.google.web.bindery.requestfactory.shared.RequestFactory;
public interface HupaRequestFactory extends RequestFactory {
+<<<<<<< HEAD
SubjectRequest subjectRequest();
ImapFolderRequest folderRequest();
@@ -58,4 +59,7 @@ public interface HupaRequestFactory exte
IdleRequest idleRequest();
SetFlagRequest setFlagRequest();
+=======
+ SubjectRequest subjectRequest();
+>>>>>>> first commit
}
\ No newline at end of file
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=1522101&r1=1522100&r2=1522101&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 Thu Sep 12 01:59:36 2013
@@ -33,7 +33,11 @@ import eu.maydu.gwt.validation.client.i1
*
*/
public class EmailListValidator extends Validator<EmailListValidator>{
+<<<<<<< HEAD
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*$";
+>>>>>>> first commit
private HasText text;
public EmailListValidator(HasText text) {
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java?rev=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java Thu Sep 12 01:59:36 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.widgets;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -170,4 +171,156 @@ public class IMAPTreeItem extends Editab
}
}
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.widgets.event.EditEvent;
+import org.apache.hupa.widgets.ui.EditableTreeItem;
+
+public class IMAPTreeItem extends EditableTreeItem {
+ protected String oldFullName;
+ protected String oldName;
+
+ public IMAPTreeItem(IMAPFolder folder) {
+ setUserObject(folder);
+ setFolderText(folder);
+ }
+
+ @Override
+ public void setSelected(boolean selected) {
+ super.setSelected(selected);
+ if (isSelected()) {
+ getWidget().addStyleName("hupa-IMAPFolder-selected");
+ } else {
+ getWidget().removeStyleName("hupa-IMAPFolder-selected");
+ }
+ }
+
+ /**
+ * Decrease the unseen messagecount of this folder
+ */
+ public void decreaseUnseenMessageCount() {
+ descreaseUnseenMessageCount(1);
+ }
+
+ public void setUnseenMessageCount(int cound) {
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+ int count = folder.getUnseeMessageCount();
+ folder.setUnseenMessageCount(count);
+ setFolderText(folder);
+
+ }
+
+
+ /**
+ * Decrease the unseen messagecount of this folder
+ */
+ public void descreaseUnseenMessageCount(int decreaseCount) {
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+ int count = folder.getUnseeMessageCount();
+ if (count > 0) {
+ count = count - decreaseCount;
+ if (count < 0) {
+ count = 0;
+ }
+ folder.setUnseenMessageCount(count);
+ setFolderText(folder);
+ }
+ }
+ /**
+ * Increase the unseen messagecount of this folder
+ */
+ public void increaseUnseenMessageCount() {
+ increaseUnseenMessageCount(1);
+ }
+
+ /**
+ * Increase the unseen messagecount of this folder
+ */
+ public void increaseUnseenMessageCount( int increaseCount) {
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+ int count = folder.getUnseeMessageCount();
+ count = count+ increaseCount;
+ folder.setUnseenMessageCount(count);
+ setFolderText(folder);
+ }
+
+ private void setFolderText(IMAPFolder folder) {
+ setText(getFolderName(folder));
+ setUnseenMessageCountStyle(folder);
+ }
+
+ private void setUnseenMessageCountStyle(IMAPFolder folder) {
+ boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
+ for (IMAPFolder fold : folder.getChildIMAPFolders()) {
+ if (fold.getUnseeMessageCount() > 0) {
+ containsUnseen = true;
+ break;
+ }
+ }
+ if (containsUnseen) {
+ getWidget().addStyleName("hupa-IMAPFolder-unseen");
+ } else {
+ getWidget().removeStyleName("hupa-IMAPFolder-unseen");
+ }
+ }
+
+ /**
+ * Return the folder name to display in the TreeItem for the given IMAPFolder
+ *
+ * @param folder
+ * @return name
+ */
+ private String getFolderName(IMAPFolder folder) {
+ if (folder.getUnseeMessageCount() > 0) {
+ return folder.getName() + " ("+folder.getUnseeMessageCount()+")";
+ }
+ return folder.getName();
+ }
+
+ @Override
+ public void setUserObject(Object obj) {
+ if ((obj instanceof IMAPFolder) == false) {
+ throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
+ }
+ setFolderText((IMAPFolder)obj);
+
+ super.setUserObject(obj);
+ }
+
+ @Override
+ public void startEdit() {
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+ oldFullName = folder.getFullName();
+ oldName = folder.getName();
+ showEditBox(oldName);
+ manager.fireEvent(new EditEvent(EditEvent.EventType.Start,oldFullName,null));
+ }
+
+ @Override
+ public void cancelEdit() {
+ IMAPFolder folder = ((IMAPFolder) getUserObject());
+ folder.setFullName(oldFullName);
+ showItem(getFolderName(folder));
+
+ manager.fireEvent(new EditEvent(EditEvent.EventType.Cancel,oldFullName,null));
+
+ }
+
+ @Override
+ public void stopEdit() {
+ if (editBox.getText().length() < 1) {
+ // Empty folder name is not allowed!
+ cancelEdit();
+ } else {
+ String newFolderName = editBox.getText();
+ String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length()) + newFolderName;
+ IMAPFolder folder = ((IMAPFolder) getUserObject());
+ folder.setFullName(newFullFolderName);
+ showItem(getFolderName(folder));
+
+ manager.fireEvent(new EditEvent(EditEvent.EventType.Stop,oldFullName,newFullFolderName));
+ }
+
+ }
+>>>>>>> first commit
}
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=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 01:59:36 2013
@@ -16,6 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
+<<<<<<< HEAD
/************[ Fonts ]***************************/
body,table td,select,* {
font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana;
@@ -39,20 +40,44 @@ body.noscroll { /* also avoids bounce ef
background: #fae5b0;
}
+=======
+
+/************[ Fonts ]***************************/
+body, table td, select, * {
+ font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana;
+ font-size: 12px;
+}
+
+/************[ widget: MyDialogBox ]****************/
+.hupa-dialog-box td.dialogMiddleCenter {
+ background: #fae5b0;
+}
+>>>>>>> first commit
.hupa-dialog-box .dialogContent .gwt-Label {
font-weight: bold;
margin: 15px;
}
+<<<<<<< HEAD
.hupa-dialog-box .Caption {
font-size: 14px;
+=======
+.hupa-dialog-box .Caption {
+ font-size: 14px;
+>>>>>>> first commit
}
/************[ widget: RndPanel ]****************/
.hupa-rounded {
+<<<<<<< HEAD
border: 1px solid #7FAAFF;
border-radius: 5px;
overflow: hidden;
+=======
+ border: 1px solid #7FAAFF;
+ border-radius: 5px;
+ overflow: hidden;
+>>>>>>> first commit
}
/************[ widget: Loading ]*************************************/
@@ -61,12 +86,21 @@ div.hupa-loading {
padding-left: 25px;
width: 100px;
height: 14px;
+<<<<<<< HEAD
white-space: nowrap;
margin-top: 5px;
margin-left: auto;
margin-right: auto;
text-align: left;
vertical-align: top;
+=======
+ white-space: nowrap;
+ margin-top: 5px;
+ margin-left: auto;
+ margin-right: auto;
+ text-align: left;
+ vertical-align: top;
+>>>>>>> first commit
}
/************[ widget: EnableHyperLink ]*********/
@@ -75,12 +109,19 @@ div.hupa-loading {
text-decoration: underline;
cursor: pointer;
}
+<<<<<<< HEAD
.hupa-hyperlink .gwt-Hyperlink-disabled {
color: #8d8d8d;
}
div.gwt-Hyperlink,div.gwt-Anchor {
+=======
+.hupa-hyperlink .gwt-Hyperlink-disabled {
+ color: #8d8d8d;
+}
+div.gwt-Hyperlink, div.gwt-Anchor {
+>>>>>>> first commit
padding-left: 4px;
}
@@ -90,6 +131,7 @@ div.Hupa {
margin-top: 0px;
padding: 0px;
width: 100%;
+<<<<<<< HEAD
min-width: 400px;
}
@@ -111,33 +153,70 @@ div.hupa-top {
padding-left: 0px;
}
+=======
+ min-width: 920px;
+}
+* html div.Hupa {
+ margin-top: 15px;
+}
+div.hupa-logo {
+ width: 90px;
+ height: 64px;
+ float: left;
+ background: url(images/hupa-logo-64-transparent.png) no-repeat;
+}
+
+div.hupa-top {
+ padding-left: 80px;
+ padding-right: 8px;
+}
+* html div.hupa-top {
+ padding-left: 0px;
+}
+>>>>>>> first commit
div.hupa-top-wrap {
height: 64px;
background-color: #C5D9FF;
}
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
div.cgb-RPC-hupa-top-wrap {
height: 59px;
}
table.hupa-top {
+<<<<<<< HEAD
width: 100%;
margin-bottom: 0px;
}
+=======
+ width: 100%;
+ margin-bottom: 0px;
+}
+>>>>>>> first commit
table.hupa-button-bar td div {
padding-top: 12px;
}
+<<<<<<< HEAD
div.hupa-loginfo-label,div.hupa-loginfo-user {
margin-left: 10px;
margin-right: 10px;
}
+=======
+div.hupa-loginfo-label, div.hupa-loginfo-user {
+ margin-left: 10px;
+}
+>>>>>>> first commit
.hupa-loginfo-user {
font-style: italic;
font-weight: bold;
}
+<<<<<<< HEAD
.hupa-menu-button {
margin-right: 15px;
@@ -145,18 +224,33 @@ div.hupa-loginfo-label,div.hupa-loginfo-
div.hupa-header {
display: none;
+=======
+.hupa-menu-button {
+ margin-right: 15px;
+}
+div.hupa-header {
+ color: transparent;
+>>>>>>> first commit
padding-left: 10px;
height: 32px;
}
+<<<<<<< HEAD
.hupa-central {
clear: both;
margin: 8px 8px 8px 8px;
min-height: 200px;
+=======
+div.hupa-main {
+ clear: both;
+ margin: 8px 8px 8px 8px;
+ min-height: 500px;
+>>>>>>> first commit
}
* html div.cgb-RPC-hupa-main {
height: 500px;
+<<<<<<< HEAD
text-align: center;
}
@@ -170,13 +264,33 @@ div.hupa-header {
left: 25%;
}
+=======
+ text-align: center;
+}
+
+div.hupa-flash {
+ border: 1px solid #FAD163;
+ background-color: #fae5b0;
+ text-align: center;
+ margin: auto auto 2px auto;
+ width: 50%;
+ position: absolute;
+ top: 45px;
+ left: 25%;
+}
+>>>>>>> first commit
* html div.hupa-flash {
border: none;
background: none;
}
+<<<<<<< HEAD
* html .hupa-flash div {
background-color: #fae5b0;
+=======
+* html .hupa-flash div {
+ background-color: #fae5b0;
+>>>>>>> first commit
}
.hupa-flash div.gwt-Label {
@@ -187,6 +301,7 @@ div.hupa-bottom {
text-align: center;
}
/************[ view: LoginView ]*******************/
+<<<<<<< HEAD
.hupa-login {
margin: 10pt auto;
width: 20%;
@@ -204,12 +319,30 @@ div.hupa-bottom {
}
.hupa-login-form {
+=======
+table.hupa-login {
+ text-align: right;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 40px;
+}
+
+table.hupa-login td {
+ text-align: center;
+ padding-top: 6px;
+}
+table.hupa-login-form {
+>>>>>>> first commit
padding: 10px;
}
.hupa-login-textbox {
width: 230px;
+<<<<<<< HEAD
background-color: #d8ecfd;
+=======
+ background-color: #d8ecfd;
+>>>>>>> first commit
border: 1px solid #7FAAFF;
margin-left: 5px;
}
@@ -223,6 +356,7 @@ div.hupa-bottom {
/************[ widget: CommandsBar ]*********/
.hupa-commands-bar {
width: 100%;
+<<<<<<< HEAD
background-color: #deeeff;
}
@@ -238,10 +372,28 @@ div.hupa-bottom {
.hupa-msgtable-row {
text-align: left;
+=======
+ padding: 5px 4px 5px 4px;
+ background-color: #deeeff;
+}
+
+/************[ view: IMAPMessageListView ]*******************/
+.hupa-msglist, .hupa-msg-top-bar, .hupa-msgtable {
+ width: 100%;
+}
+.hupa-msg-top-bar {
+ padding: 10px 4px 10px 4px;
+ background-color: #C3D9FF;
+}
+
+.hupa-msgtable-row {
+ text-align: left;
+>>>>>>> first commit
vertical-align: top;
padding: 0px 10px 0px 10px;
cursor: pointer;
}
+<<<<<<< HEAD
.hupa-msgtable-unseen {
font-weight: bold;
@@ -253,10 +405,22 @@ div.hupa-bottom {
padding: 20px;
}
+=======
+.hupa-msgtable-unseen {
+ font-weight: bold;
+}
+
+.hupa-msgtable-empty {
+ font-weight: bold;
+ text-align: center;
+ padding: 20px;
+}
+>>>>>>> first commit
.hupa-search-box {
width: 150px;
}
+<<<<<<< HEAD
input[type=text],input[type=file],textarea {
background-color: #d8ecfd;
border: 1px solid #7FAAFF;
@@ -268,36 +432,71 @@ input[type=text],input[type=file],textar
.gwt-SuggestBoxPopup {
font-size: 10px;
+=======
+input[type=text], input[type=file], textarea {
+ background-color: #d8ecfd;
+ border: 1px solid #7FAAFF;
+}
+
+.dragdrop-dragable{
+ background: red;
+ }
+
+.gwt-SuggestBoxPopup {
+ font-size: 10px;
+>>>>>>> first commit
}
.hupa-buttons .gwt-ListBox {
margin-left: 5px;
+<<<<<<< HEAD
padding-left: 3px;
+=======
+>>>>>>> first commit
}
/*************[ buttonbars ]*********************/
.hupa-buttons {
+<<<<<<< HEAD
white-space: nowrap;
}
.hupa-buttons td {
padding-left: 3px;
+=======
+ white-space: nowrap;
+}
+
+.hupa-buttons td {
+ padding-left: 3px;
+>>>>>>> first commit
}
.hupa-buttons div {
white-space: nowrap;
vertical-align: middle;
}
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
.hupa-buttons .gwt-Hyperlink {
padding-left: 6px;
}
+<<<<<<< HEAD
/************[ widget: MessageHeaders ]*******************/
table.hupa-msg-headers {
background-color: #C3D9FF;
}
+=======
+
+/************[ widget: MessageHeaders ]*******************/
+table.hupa-msg-headers {
+ background-color: #C3D9FF;
+}
+>>>>>>> first commit
.hupa-msg-headers td.label {
width: 175px;
text-align: right;
@@ -309,7 +508,10 @@ table.hupa-msg-headers {
table.hupa-msgview {
width: 100%;
}
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
div.hupa-msgview-content {
padding: 20px;
}
@@ -322,18 +524,26 @@ div.hupa-msgview-content {
cursor: pointer;
}
+<<<<<<< HEAD
.hupa-attachment-view {
margin-left: 10px;
}
+=======
+>>>>>>> first commit
/************[ view: MessageSendView ]*******************/
table.hupa-msgsend {
width: 100%;
}
.hupa-validate-error {
+<<<<<<< HEAD
border: 1pt solid red;
background-color: #fae5b0;
+=======
+ border: 1pt solid red;
+ background-color: #fae5b0;
+>>>>>>> first commit
}
/************[ view: ContactsView ]*******************/
@@ -342,12 +552,17 @@ table.hupa-contacts {
margin-right: auto;
}
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
/************************************************************************/
/*** Non re-factored stuff ***/
.cbg-ButtonContent {
font-size: 80%;
}
+<<<<<<< HEAD
.hupa-ErrorLabel,.gwt-PagingOptions .errorMessage {
color: #FF0000;
}
@@ -480,4 +695,89 @@ div.hupa-main {
.gwt-SuggestBox {
border-radius: 50px;
max-height: 8px;
-}
\ No newline at end of file
+}
+=======
+.hupa-ErrorLabel, .gwt-PagingOptions .errorMessage {
+ color: #FF0000;
+}
+
+.gwt-ScrollTable .dataTable td {
+ border-top: 1pt solid #EEEEEE;
+ white-space: nowrap;
+ padding: 0px 10px 0px 10px;
+ overflow: hidden;
+ font-size: 12px;
+ cursor: pointer;
+}
+
+
+.gwt-ScrollTable .dataTable tr.highlighted {
+ background: #FAD163;
+}
+
+.gwt-ScrollTable .dataTable tr.selected td {
+ background: #FFF7D7;
+}
+
+.hupa-IMAPFolder-unseen {
+ font-weight: bold;
+}
+
+.hupa-IMAPFolder-selected {
+ background: #f1e77b;
+ width: 100%;
+}
+
+.hupa-droptarget-invalid {
+ color: red;
+}
+
+.hupa-editor {
+ 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(#FFFFFF, #C5D9FF);
+ background: -webkit-linear-gradient(#FFFFFF, #C5D9FF);
+ background: -o-linear-gradient(#FFFFFF, #C5D9FF);
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', 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 {
+ text-shadow: 1px 1px 3px #666666;
+}
+* html .hupa-bottom {
+ filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=1);
+}
+>>>>>>> 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=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 01:59:36 2013
@@ -18,13 +18,20 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<<<<<<< HEAD
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
+=======
+>>>>>>> first commit
<link rel="Shortcut Icon" href="favicon.ico" type="image/x-icon"/>
<title>Hupa webmail</title>
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
<!-- define loading style early -->
<style type="text/css">
div.loading {
@@ -34,22 +41,33 @@
}
.loading img {
position: absolute;
+<<<<<<< HEAD
top: 37%;
left: 50%;
}
#login {
display: none;
}
+=======
+ top: 50%;
+ left: 50%;
+ }
+>>>>>>> first commit
</style>
</head>
<!-- Add this to disable right menu in some browsers: -->
<!-- oncontextmenu="return false;" -->
<body>
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
<!-- An image is shown while the application is loaded -->
<!-- It will be removed as soon as the app is ready -->
<div id="loading" class="loading">
<img src="images/hupa-spinning.gif">
+<<<<<<< HEAD
</div>
<!-- We need this because passwords in forms rendered by js are not saved in browsers -->
@@ -58,6 +76,8 @@
<input autocomplete="on" autocapitalize="off" id="email" name="email" type="text">
<input autocomplete="on" autocapitalize="off" id="password" name="password" type="password">
</form>
+=======
+>>>>>>> first commit
</div>
<!-- Necessary for history support -->
@@ -65,8 +85,13 @@
<!-- Download attachments needs this -->
<iframe src="" id="__download" style="width:0;height:0;border:0"></iframe>
+<<<<<<< HEAD
+=======
+ </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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -14,11 +14,19 @@
the specific language governing permissions and limitations under the
License.
-->
+<<<<<<< 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">
+=======
+<!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>
+>>>>>>> first commit
<!-- Max size of the upload request (10MB) -->
<context-param>
@@ -44,7 +52,11 @@
</filter-mapping>
<listener>
+<<<<<<< HEAD
<listener-class>org.apache.hupa.server.ioc.GuiceListener</listener-class>
+=======
+ <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
+>>>>>>> first commit
</listener>
<!-- Gwt remote logging -->
@@ -59,7 +71,10 @@
<!-- Default page to serve -->
<welcome-file-list>
+<<<<<<< HEAD
<welcome-file>index.jsp</welcome-file>
+=======
+>>>>>>> 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -19,20 +19,35 @@
package org.apache.hupa.client.mock;
+<<<<<<< HEAD
import gwtupload.client.IUploader;
import org.apache.hupa.client.activity.ComposeActivity.Displayable;
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
import org.apache.hupa.widgets.ui.HasEnable;
+=======
+>>>>>>> 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
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Widget;
public class MockMessageSendDisplay implements Displayable {
+=======
+import com.google.gwt.user.client.ui.Widget;
+
+import gwtupload.client.IUploader;
+
+import org.apache.hupa.client.mvp.MessageSendPresenter.Display;
+import org.apache.hupa.shared.rpc.ContactsResult.Contact;
+import org.apache.hupa.widgets.ui.HasEnable;
+
+public class MockMessageSendDisplay implements Display {
+>>>>>>> first commit
HasClickHandlers backClick = new MockWidget();
HasText bccText = new MockWidget();
@@ -70,6 +85,13 @@ public class MockMessageSendDisplay impl
return editorFocus;
}
+<<<<<<< HEAD
+=======
+ public HasText getFromText() {
+ return fromText;
+ }
+
+>>>>>>> first commit
public HasHTML getMessageHTML() {
return messageHtml;
}
@@ -128,6 +150,7 @@ public class MockMessageSendDisplay impl
return true;
}
+<<<<<<< HEAD
@Override
public void showCc() {
// TODO Auto-generated method stub
@@ -278,4 +301,6 @@ public class MockMessageSendDisplay impl
return null;
}
+=======
+>>>>>>> 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.mock;
+<<<<<<< HEAD
import gwtupload.client.IFileInput;
import gwtupload.client.IUploadStatus;
import gwtupload.client.IUploadStatus.Status;
@@ -30,6 +31,20 @@ import com.google.gwt.core.client.JavaSc
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.Widget;
+=======
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.ui.Widget;
+
+import gwtupload.client.IFileInput;
+import gwtupload.client.IUploadStatus;
+import gwtupload.client.IUploader;
+import gwtupload.client.IUploadStatus.Status;
+import gwtupload.client.IUploader.UploadedInfo;
+
+import java.util.Iterator;
+
+>>>>>>> first commit
public class MockUploader implements IUploader {
public HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler) {
@@ -118,7 +133,11 @@ public class MockUploader implements IUp
// TODO Auto-generated method stub
}
+<<<<<<< HEAD
public void setValidExtensions(String... ext) {
+=======
+ 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -31,7 +31,10 @@ public class EmailListValidatorTest exte
assertFalse(EmailListValidator.isValidAddressList("abc@abc.def ; ; MMM <mc...@aa>;;;"));
assertTrue(EmailListValidator.isValidAddressList("abc@abc.def ; ; MMM <mc...@aa.co>;;;"));
assertTrue(EmailListValidator.isValidAddressList("abc@abc.def\nMMM <mc...@aa.co>;;;"));
+<<<<<<< HEAD
assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail.com@james.apache.org"));
+=======
+>>>>>>> first commit
}
}
Modified: james/hupa/trunk/mock/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu Sep 12 01:59:36 2013
@@ -17,12 +17,24 @@
specific language governing permissions and limitations
under the License.
-->
+<<<<<<< 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>
<groupId>org.apache.james.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<version>0.0.3-SNAPSHOT</version>
+=======
+<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>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-parent</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+>>>>>>> first commit
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa-mock</artifactId>
@@ -31,7 +43,11 @@
<description>Mock objects for hupa</description>
<dependencies>
<dependency>
+<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
+=======
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-shared</artifactId>
</dependency>
<dependency>
@@ -69,6 +85,14 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
+<<<<<<< HEAD
+=======
+ <groupId>net.customware.gwt.dispatch
+ </groupId>
+ <artifactId>gwt-dispatch</artifactId>
+ </dependency>
+ <dependency>
+>>>>>>> first commit
<groupId>com.googlecode.gwtupload</groupId>
<artifactId>gwtupload</artifactId>
</dependency>
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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -21,10 +21,18 @@ package org.apache.hupa.server.guice;
import java.util.Properties;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
import com.google.inject.AbstractModule;
+=======
+import net.customware.gwt.dispatch.server.guice.ActionHandlerModule;
+
+import org.apache.hupa.shared.data.Settings;
+import org.apache.hupa.shared.data.User;
+
+>>>>>>> first commit
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -73,10 +81,17 @@ import com.google.inject.name.Named;
* @author manolo
*
*/
+<<<<<<< HEAD
public abstract class AbstractGuiceTestModule extends AbstractModule{
protected static class TestUser extends UserImpl {
+=======
+public abstract class AbstractGuiceTestModule extends ActionHandlerModule {
+
+ protected static class TestUser extends User {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
@Inject
public TestUser(@Named("Username") String username,
@Named("Password") String password,
@@ -86,7 +101,12 @@ public abstract class AbstractGuiceTestM
@Named("DefaultDraftsFolder") final String draft) {
setName(username);
setPassword(password);
+<<<<<<< HEAD
setSettings(new SettingsImpl() {
+=======
+ setSettings(new Settings() {
+ private static final long serialVersionUID = 1L;
+>>>>>>> first commit
{
setInboxFolderName(inbox);
setSentFolderName(sent);
@@ -114,17 +134,37 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "143");
put("IMAPS", "false");
+<<<<<<< HEAD
+=======
+ put("TrustStore", "my-truststore");
+ put("TrustStorePassword", "my-truststore-password");
+
+ put("IMAPConnectionPoolSize", "4");
+ put("IMAPConnectionPoolTimeout", "300000");
+
+>>>>>>> first commit
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "Trash");
put("DefaultSentFolder", "Sent");
put("DefaultDraftsFolder", "Drafts");
+<<<<<<< HEAD
+=======
+ put("PostFetchMessageCount", "0");
+
+>>>>>>> first commit
put("SMTPServerAddress", "localhost");
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "true");
+<<<<<<< HEAD
put("SessionDebug", "true");
+=======
+ put("SessionDebug", "false");
+
+ put("DefaultUserSessionId", "just_an_id");
+>>>>>>> first commit
}
};
@@ -144,17 +184,37 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "143");
put("IMAPS", "false");
+<<<<<<< HEAD
+=======
+ put("TrustStore", "my-truststore");
+ put("TrustStorePassword", "my-truststore-password");
+
+ put("IMAPConnectionPoolSize", "4");
+ put("IMAPConnectionPoolTimeout", "300000");
+
+>>>>>>> first commit
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "INBOX.Trash");
put("DefaultSentFolder", "INBOX.Sent");
put("DefaultDraftsFolder", "INBOX.Drafts");
+<<<<<<< HEAD
+=======
+ put("PostFetchMessageCount", "0");
+
+>>>>>>> first commit
put("SMTPServerAddress", "mail.hotelsearch.com");
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "true");
+<<<<<<< HEAD
put("SessionDebug", "true");
+=======
+ put("SessionDebug", "false");
+
+ put("DefaultUserSessionId", "just_an_id");
+>>>>>>> first commit
}
};
@@ -173,6 +233,12 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "993");
put("IMAPS", "true");
+<<<<<<< HEAD
+=======
+ put("TrustStore", "my-truststore");
+ put("TrustStorePassword", "my-truststore-password");
+
+>>>>>>> first commit
put("IMAPConnectionPoolSize", "4");
put("IMAPConnectionPoolTimeout", "300000");
@@ -181,12 +247,23 @@ public abstract class AbstractGuiceTestM
put("DefaultSentFolder", "[Gmail]/Sent Mail");
put("DefaultDraftsFolder", "[Gmail]/Drafts");
+<<<<<<< HEAD
+=======
+ put("PostFetchMessageCount", "0");
+
+>>>>>>> first commit
put("SMTPServerAddress", "smtp.gmail.com");
put("SMTPServerPort", "465");
put("SMTPS", "true");
put("SMTPAuth", "true");
+<<<<<<< HEAD
put("SessionDebug", "true");
+=======
+ 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -19,21 +19,34 @@
package org.apache.hupa.server.mock;
+<<<<<<< HEAD
import java.util.Properties;
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
import org.apache.hupa.shared.domain.Settings;
import org.apache.hupa.shared.domain.User;
+=======
+import org.apache.hupa.shared.data.Settings;
+import org.apache.hupa.shared.data.User;
+
+import java.util.Properties;
+>>>>>>> first commit
/**
* Constants and properties used for mock mode
*/
public class MockConstants {
+<<<<<<< HEAD
public static String SESSION_ID = "MockID";
public final static Settings mockSettings = new SettingsImpl() {
+=======
+
+ 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);
@@ -47,6 +60,10 @@ public class MockConstants {
{
put("Username", MockIMAPStore.MOCK_LOGIN);
put("Password", MockIMAPStore.MOCK_LOGIN);
+<<<<<<< HEAD
+=======
+ put("DefaultUserSessionId", "DEMO_ID");
+>>>>>>> first commit
put("IMAPServerAddress", MockIMAPStore.MOCK_HOST);
put("SMTPServerAddress", MockIMAPStore.MOCK_HOST);
@@ -62,7 +79,12 @@ public class MockConstants {
}
};
+<<<<<<< HEAD
public final static Settings mockUserSettings = new SettingsImpl() {
+=======
+ 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);
@@ -71,7 +93,12 @@ public class MockConstants {
}
};
+<<<<<<< HEAD
public final static User mockUser = new UserImpl() {
+=======
+ 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -30,6 +30,10 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import com.google.inject.Inject;
+<<<<<<< HEAD
+=======
+import com.google.inject.name.Named;
+>>>>>>> first commit
@SuppressWarnings("deprecation")
public class MockHttpSession implements HttpSession{
@@ -40,9 +44,15 @@ public class MockHttpSession implements
private static int seq = 0;
@Inject
+<<<<<<< HEAD
public MockHttpSession() {
cTime = System.currentTimeMillis();
this.id = MockConstants.SESSION_ID + "-" + seq++;
+=======
+ public MockHttpSession(@Named("DefaultUserSessionId") String id) {
+ cTime = System.currentTimeMillis();
+ this.id = id + "-" + seq++;
+>>>>>>> first commit
}
public Object getAttribute(String name) {
@@ -50,8 +60,13 @@ public class MockHttpSession implements
}
+<<<<<<< HEAD
@SuppressWarnings("rawtypes")
public Enumeration getAttributeNames() {
+=======
+ @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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -18,18 +18,32 @@
****************************************************************/
package org.apache.hupa.server.mock;
+<<<<<<< HEAD
import javax.servlet.http.HttpSession;
import com.google.inject.Inject;
import com.google.inject.Provider;
+=======
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+
+import javax.servlet.http.HttpSession;
+>>>>>>> first commit
public class MockHttpSessionProvider implements Provider<HttpSession> {
static HttpSession session = null;
@Inject
+<<<<<<< HEAD
public MockHttpSessionProvider() {
if (session == null) {
session = new MockHttpSession();
+=======
+ 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -19,6 +19,12 @@
package org.apache.hupa.server.mock;
+<<<<<<< HEAD
+=======
+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;
@@ -26,18 +32,28 @@ import java.util.List;
import javax.mail.FetchProfile;
import javax.mail.Flags;
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
+=======
+>>>>>>> first commit
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Store;
+<<<<<<< HEAD
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
+=======
+import javax.mail.Flags.Flag;
+import javax.mail.internet.MimeMessage;
+import javax.mail.search.SearchTerm;
+
+>>>>>>> first commit
public class MockIMAPFolder extends IMAPFolder {
public static final char SEPARATOR = '.';
@@ -256,6 +272,7 @@ public class MockIMAPFolder extends IMAP
}
@Override
+<<<<<<< HEAD
public synchronized Message[] search(SearchTerm search)
throws MessagingException {
checkExists();
@@ -266,6 +283,12 @@ public class MockIMAPFolder extends IMAP
}
}
return ret.toArray(new Message[0]);
+=======
+ public synchronized Message[] search(SearchTerm arg0)
+ throws MessagingException {
+ checkExists();
+ return getMessages();
+>>>>>>> first commit
}
@Override
@@ -306,11 +329,19 @@ public class MockIMAPFolder extends IMAP
Message[] array = new Message[ints.length];
for (int i = 0; i < ints.length; i++) {
+<<<<<<< HEAD
int mInt = ints[i];
if (mInt > messages.size() || mInt < 0) {
throw new MessagingException();
}
array[i] = messages.get(ints[i]);
+=======
+ int mInt = ints[i] - 1;
+ if (mInt > messages.size() || mInt < messages.size()) {
+ throw new MessagingException();
+ }
+ array[i] = messages.get(i);
+>>>>>>> first commit
}
return array;
}
Modified: james/hupa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Sep 12 01:59:36 2013
@@ -17,25 +17,45 @@
specific language governing permissions and limitations
under the License.
-->
+<<<<<<< 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">
+=======
+<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
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8.1</version>
+<<<<<<< HEAD
<relativePath />
</parent>
<groupId>org.apache.james.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<version>0.0.3-SNAPSHOT</version>
+=======
+ <relativePath></relativePath>
+ </parent>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-parent</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+>>>>>>> first commit
<packaging>pom</packaging>
<name>Apache James Hupa Parent</name>
<description>Hupa is a GWT based Webmail</description>
<url>http://james.apache.org/hupa</url>
<inceptionYear>2009</inceptionYear>
<modules>
+<<<<<<< HEAD
<module>shared</module>
<module>mock</module>
+=======
+ <module>mock</module>
+ <module>shared</module>
+>>>>>>> first commit
<module>server</module>
<module>widgets</module>
<module>client</module>
@@ -56,6 +76,7 @@
</site>
</distributionManagement>
<properties>
+<<<<<<< HEAD
<gwtVersion>2.5.1</gwtVersion>
<gwtMavenVersion>2.5.1</gwtMavenVersion>
<gwt.moduleSuffix />
@@ -113,16 +134,39 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+=======
+ <gwtVersion>2.4.0</gwtVersion>
+ <gwtMavenVersion>2.4.0</gwtMavenVersion>
+ <jettyVersion>7.3.0.v20110203</jettyVersion>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-mock</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
+=======
+ <groupId>org.apache.hupa</groupId>
+>>>>>>> first commit
<artifactId>hupa-shared</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
+=======
+ <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=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Thu Sep 12 01:59:36 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -143,3 +144,144 @@
</plugins>
</build>
</project>
+=======
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<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>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-parent</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>hupa-server</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache James Hupa Server</name>
+ <description>Servercode implementation to access IMAP Mailbox</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-mock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-shared</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.customware.gwt.dispatch
+ </groupId>
+ <artifactId>gwt-dispatch</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwtupload</groupId>
+ <artifactId>gwtupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <outputDirectory>war/WEB-INF/classes</outputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+ <webResources>
+ <resource>
+ <directory>war</directory>
+ <excludes>
+ <exclude>**/hupa/*</exclude>
+ </excludes>
+ </resource>
+ </webResources>
+ <warName>${project.name}</warName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+>>>>>>> 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -24,7 +24,11 @@ import javax.mail.NoSuchProviderExceptio
import javax.mail.Session;
import javax.mail.Transport;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
+=======
+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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -29,7 +29,11 @@ import javax.mail.Session;
import javax.mail.Transport;
import org.apache.commons.logging.Log;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
+=======
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -92,6 +96,7 @@ public class InMemoryIMAPStoreCache impl
* @see org.apache.hupa.server.IMAPStoreCache#get(org.apache.hupa.shared.data.User)
*/
public IMAPStore get(User user) throws MessagingException {
+<<<<<<< HEAD
IMAPStore ret = get(user.getName(),user.getPassword());
// TODO: this is a hack, we should have a default domain suffix in configuration files
@@ -99,6 +104,9 @@ public class InMemoryIMAPStoreCache impl
user.setName(user.getName() + "@gmail.com");
}
return ret;
+=======
+ return get(user.getName(),user.getPassword());
+>>>>>>> first commit
}
/*
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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -21,6 +21,10 @@ package org.apache.hupa.server.guice;
import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
+<<<<<<< HEAD
+=======
+import org.apache.hupa.server.servlet.HupaDispatchServlet;
+>>>>>>> first commit
import org.apache.hupa.server.servlet.MessageSourceServlet;
import org.apache.hupa.server.servlet.UploadAttachmentServlet;
import org.apache.hupa.shared.SConsts;
@@ -31,6 +35,10 @@ import com.google.inject.servlet.Servlet
public class DispatchServletModule extends ServletModule{
@Override
public void configureServlets() {
+<<<<<<< HEAD
+=======
+ serve("/" + SConsts.HUPA + SConsts.SERVLET_DISPATCH).with(HupaDispatchServlet.class );
+>>>>>>> first commit
serve("/" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD).with(DownloadAttachmentServlet.class);
serve("/" + SConsts.HUPA + SConsts.SERVLET_UPLOAD).with(UploadAttachmentServlet.class);
serve("/" + SConsts.HUPA + SConsts.SERVLET_SOURCE).with(MessageSourceServlet.class);
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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -19,8 +19,12 @@
package org.apache.hupa.server.guice.providers;
+<<<<<<< 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 com.google.inject.Inject;
import com.google.inject.Provider;
@@ -47,7 +51,11 @@ public class DefaultUserSettingsProvider
* @see com.google.inject.Provider#get()
*/
public Settings get() {
+<<<<<<< HEAD
Settings settings = new SettingsImpl();
+=======
+ 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -17,6 +17,10 @@
* under the License. *
****************************************************************/
+<<<<<<< HEAD
+=======
+
+>>>>>>> first commit
package org.apache.hupa.server.guice.providers;
import org.apache.commons.logging.Log;
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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -24,7 +24,11 @@ import java.util.ArrayList;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
+=======
+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/preferences/InImapUserPreferencesStorage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java?rev=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -48,7 +48,11 @@ import org.apache.commons.io.output.Byte
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.server.utils.MessageUtils;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
+=======
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
import com.google.inject.Inject;
@@ -62,7 +66,10 @@ import com.sun.mail.imap.IMAPStore;
* @author manolo
*/
public class InImapUserPreferencesStorage extends UserPreferencesStorage {
+<<<<<<< HEAD
+=======
+>>>>>>> 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=1522101&r1=1522100&r2=1522101&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 01:59:36 2013
@@ -23,6 +23,10 @@ import org.apache.hupa.shared.rpc.Contac
import java.util.Arrays;
import java.util.List;
+<<<<<<< HEAD
+=======
+import java.util.regex.Pattern;
+>>>>>>> first commit
/**
*
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=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java Thu Sep 12 01:59:36 2013
@@ -38,7 +38,11 @@ import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.shared.SConsts;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
+=======
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.inject.Inject;
import com.sun.mail.imap.IMAPFolder;
@@ -79,12 +83,17 @@ public class DownloadAttachmentServlet e
String message_uuid = request.getParameter(SConsts.PARAM_UID);
String attachmentName = request.getParameter(SConsts.PARAM_NAME);
String folderName = request.getParameter(SConsts.PARAM_FOLDER);
+<<<<<<< HEAD
String mode = request.getParameter(SConsts.PARAM_MODE);
boolean inline = "inline".equals(mode);
if (!inline) {
response.setHeader("Content-disposition", "attachment; filename="
+ attachmentName + "");
}
+=======
+ response.setHeader("Content-disposition", "attachment; filename="
+ + attachmentName + "");
+>>>>>>> first commit
InputStream in = null;
OutputStream out = response.getOutputStream();
@@ -106,11 +115,15 @@ public class DownloadAttachmentServlet e
in = part.getInputStream();
if (in != null) {
+<<<<<<< HEAD
// FIXME: for some reason Chrome does not display inline images when they have the content-length
// it's like the size reported in server is different than the received bytes.
if (!inline) {
response.setContentLength(part.getSize());
}
+=======
+ response.setContentLength(part.getSize());
+>>>>>>> first commit
IOUtils.copy(in, out);
} else {
response.setContentLength(0);
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=1522101&r1=1522100&r2=1522101&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 Thu Sep 12 01:59:36 2013
@@ -31,9 +31,15 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
+<<<<<<< HEAD
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.User;
+=======
+import org.apache.hupa.server.InMemoryIMAPStoreCache;
+import org.apache.hupa.shared.SConsts;
+import org.apache.hupa.shared.data.User;
+>>>>>>> first commit
import com.google.inject.Inject;
import com.sun.mail.imap.IMAPFolder;
@@ -45,11 +51,19 @@ import com.sun.mail.imap.IMAPStore;
public class MessageSourceServlet extends HttpServlet {
private static final long serialVersionUID = 1245563204035792963L;
+<<<<<<< HEAD
private IMAPStoreCache cache;
private Log logger;
@Inject
public MessageSourceServlet(IMAPStoreCache cache, Log logger) {
+=======
+ private InMemoryIMAPStoreCache cache;
+ private Log logger;
+
+ @Inject
+ public MessageSourceServlet(InMemoryIMAPStoreCache cache, Log logger) {
+>>>>>>> first commit
this.cache = cache;
this.logger = logger;
}
@@ -87,7 +101,11 @@ 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);
+<<<<<<< HEAD
throw new ServletException(msg, e);
+=======
+ throw new ServletException(msg);
+>>>>>>> first commit
} finally {
IOUtils.closeQuietly(outs);
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java?rev=1522101&r1=1522100&r2=1522101&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java Thu Sep 12 01:59:36 2013
@@ -53,7 +53,12 @@ public enum ConfigurationProperties {
// Used only in demo mode
USERNAME("Username", false, null),
+<<<<<<< HEAD
PASSWORD("Password", false, null);
+=======
+ PASSWORD("Password", false, null),
+ SESSIONID("DefaultUserSessionId", false, null);
+>>>>>>> first commit
private String property;
private boolean mandatory;
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=1522101&r1=1522100&r2=1522101&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 Sep 12 01:59:36 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.server.utils;
+<<<<<<< HEAD
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -29,6 +30,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+=======
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+>>>>>>> first commit
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -44,6 +51,10 @@ import javax.mail.internet.MimeUtility;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.logging.Log;
+<<<<<<< HEAD
+=======
+import org.apache.hupa.server.handler.AbstractSendMessageHandler;
+>>>>>>> first commit
@@ -76,7 +87,11 @@ public class MessageUtils {
}
Address[] array = new Address[recipients.size()];
for (int i = 0; i < recipients.size(); i++) {
+<<<<<<< HEAD
array[i] = new InternetAddress(encodeEmail(recipients.get(i)));
+=======
+ array[i] = new InternetAddress(recipients.get(i));
+>>>>>>> first commit
}
return array;
}
@@ -175,11 +190,16 @@ public class MessageUtils {
*/
public static BodyPart fileitemToBodypart(FileItem item) throws MessagingException {
MimeBodyPart messageBodyPart = new MimeBodyPart();
+<<<<<<< HEAD
DataSource source = new FileItemDataStore(item);
+=======
+ DataSource source = new AbstractSendMessageHandler.FileItemDataStore(item);
+>>>>>>> first commit
messageBodyPart.setDataHandler(new DataHandler(source));
messageBodyPart.setFileName(source.getName());
return messageBodyPart;
}
+<<<<<<< HEAD
/**
* DataStore which wrap a FileItem
@@ -279,4 +299,7 @@ public class MessageUtils {
}
return ret;
}
+=======
+
+>>>>>>> first commit
}
\ No newline at end of file
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=1522101&r1=1522100&r2=1522101&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 Sep 12 01:59:36 2013
@@ -48,8 +48,12 @@ public class RegexPatterns {
public static final Pattern regex_inlineImg = Pattern.compile("(?si)(<\\s*img\\s+.*?src=)[\"']?cid:([^\"']+)[\"']?");
public static final String repl_inlineImg = "$1'" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD
+<<<<<<< HEAD
+ "?" + SConsts.PARAM_MODE + "=inline"
+ "&" + SConsts.PARAM_FOLDER + "=%%FOLDER%%"
+=======
+ + "?" + SConsts.PARAM_FOLDER + "=%%FOLDER%%"
+>>>>>>> first commit
+ "&" + SConsts.PARAM_UID + "=%%UID%%"
+ "&" + SConsts.PARAM_NAME + "=$2' name='cid:$2'";
@@ -100,4 +104,8 @@ public class RegexPatterns {
// s=s.replaceAll("[ \t]+", " ");
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> first commit
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=1522101&r1=1522100&r2=1522101&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 Thu Sep 12 01:59:36 2013
@@ -15,11 +15,14 @@
# limitations under the License.
#############################################################################
+<<<<<<< HEAD
# The demo mode should make two lines different
# 1. IMAPServerAddress=hupa.demo
# 2. DefaultInboxFolder=Mock-Inbox
# and then use the credential: demo/demo to login to the webmail through the browser
+=======
+>>>>>>> first commit
# The IP or domainname of the IMAP server
IMAPServerAddress=imap.gmail.com
# The port of the IMAP server
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org