Author: norman
Date: Thu Jul 30 11:38:16 2009
New Revision: 799241
URL: http://svn.apache.org/viewvc?rev=799241&view=rev
Log:
move handlers to its own package
use annotations to set address / port of the IMAP / SMTP server
Added:
labs/hupa/src/main/java/org/apache/hupa/server/annotations/
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerAddress.java
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerPort.java
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPAuth.java
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerAddress.java
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerPort.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/LogoutUserHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/NoopHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java
- copied, changed from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
Removed:
labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java
Modified: labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java?rev=799241&r1=799240&r2=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java Thu Jul
30 11:38:16 2009
@@ -27,6 +27,8 @@
import javax.mail.Session;
import org.apache.commons.logging.Log;
+import org.apache.hupa.server.annotations.IMAPServerAddress;
+import org.apache.hupa.server.annotations.IMAPServerPort;
import org.apache.hupa.shared.data.User;
import com.google.inject.Inject;
@@ -40,10 +42,14 @@
private Session session;
protected Log logger;
private final Map<String,IMAPStore> pool = new HashMap<String
,IMAPStore>();
+ private String address;
+ private int port;
@Inject
- public IMAPStoreCache(Log logger) {
+ public IMAPStoreCache(Log logger,@IMAPServerAddress String address,
@IMAPServerPort int port) {
this.logger = logger;
+ this.address = address;
+ this.port = port;
props.setProperty("mail.mime.decodetext.strict", "false");
session = Session.getDefaultInstance(props, null);
@@ -59,7 +65,7 @@
if (store == null) {
logger.debug("No cached store found for user "
+username);
store = (IMAPStore) session.getStore("imap");
- store.connect("myblog.kicks-ass.org", 143,
username,password);
+ store.connect(address, port, username,password);
}
pool.put(username,store);
return store;
Added:
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerAddress.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerAddress.java?rev=799241&view=auto
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerAddress.java
(added)
+++
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerAddress.java
Thu Jul 30 11:38:16 2009
@@ -0,0 +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.server.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+...@bindingannotation
+...@retention(RetentionPolicy.RUNTIME)
+...@target({ElementType.FIELD, ElementType.PARAMETER,ElementType.METHOD})
+public @interface IMAPServerAddress {
+
+}
Added:
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerPort.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerPort.java?rev=799241&view=auto
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerPort.java
(added)
+++
labs/hupa/src/main/java/org/apache/hupa/server/annotations/IMAPServerPort.java
Thu Jul 30 11:38:16 2009
@@ -0,0 +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.server.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+...@bindingannotation
+...@retention(RetentionPolicy.RUNTIME)
+...@target({ElementType.FIELD, ElementType.PARAMETER,ElementType.METHOD})
+public @interface IMAPServerPort {
+
+}
Added: labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPAuth.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPAuth.java?rev=799241&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPAuth.java
(added)
+++ labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPAuth.java
Thu Jul 30 11:38:16 2009
@@ -0,0 +1,35 @@
+/****************************************************************
+ * 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.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+
+...@bindingannotation
+...@retention(RetentionPolicy.RUNTIME)
+...@target({ElementType.FIELD, ElementType.PARAMETER,ElementType.METHOD})
+public @interface SMTPAuth {
+
+}
Added:
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerAddress.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerAddress.java?rev=799241&view=auto
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerAddress.java
(added)
+++
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerAddress.java
Thu Jul 30 11:38:16 2009
@@ -0,0 +1,35 @@
+/****************************************************************
+ * 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.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+
+...@bindingannotation
+...@retention(RetentionPolicy.RUNTIME)
+...@target({ElementType.FIELD, ElementType.PARAMETER,ElementType.METHOD})
+public @interface SMTPServerAddress {
+
+}
Added:
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerPort.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerPort.java?rev=799241&view=auto
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerPort.java
(added)
+++
labs/hupa/src/main/java/org/apache/hupa/server/annotations/SMTPServerPort.java
Thu Jul 30 11:38:16 2009
@@ -0,0 +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.server.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+...@bindingannotation
+...@retention(RetentionPolicy.RUNTIME)
+...@target({ElementType.FIELD, ElementType.PARAMETER,ElementType.METHOD})
+public @interface SMTPServerPort {
+
+}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java?rev=799241&r1=799240&r2=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/guice/ServerModul.java Thu
Jul 30 11:38:16 2009
@@ -22,24 +22,29 @@
import net.customware.gwt.dispatch.server.guice.ActionHandlerModule;
import org.apache.commons.logging.Log;
-import org.apache.hupa.server.DeleteMessageHandler;
-import org.apache.hupa.server.ExposeMessageHandler;
-import org.apache.hupa.server.FetchFoldersHandler;
-import org.apache.hupa.server.FetchMessagesHandler;
import org.apache.hupa.server.FileItemRegistry;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.LoginSessionHandler;
-import org.apache.hupa.server.LoginUserHandler;
-import org.apache.hupa.server.LogoutUserHandler;
-import org.apache.hupa.server.NoopHandler;
-import org.apache.hupa.server.SendMessageHandler;
+import org.apache.hupa.server.annotations.IMAPServerAddress;
+import org.apache.hupa.server.annotations.IMAPServerPort;
+import org.apache.hupa.server.annotations.SMTPAuth;
+import org.apache.hupa.server.annotations.SMTPServerAddress;
+import org.apache.hupa.server.annotations.SMTPServerPort;
+import org.apache.hupa.server.handler.DeleteMessageHandler;
+import org.apache.hupa.server.handler.ExposeMessageHandler;
+import org.apache.hupa.server.handler.FetchFoldersHandler;
+import org.apache.hupa.server.handler.FetchMessagesHandler;
+import org.apache.hupa.server.handler.LoginSessionHandler;
+import org.apache.hupa.server.handler.LoginUserHandler;
+import org.apache.hupa.server.handler.LogoutUserHandler;
+import org.apache.hupa.server.handler.NoopHandler;
+import org.apache.hupa.server.handler.SendMessageHandler;
import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
import org.apache.hupa.server.servlet.UploadAttachmentServlet;
import com.google.inject.Singleton;
/**
- * Module which binds the handlers
+ * Module which binds the handlers and configurations
*
* @author norman
*
@@ -63,6 +68,13 @@
bind(IMAPStoreCache.class).in(Singleton.class);
bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
bind(DownloadAttachmentServlet.class).in(Singleton.class);
- bind(UploadAttachmentServlet.class).in(Singleton.class);
+ bind(UploadAttachmentServlet.class).in(Singleton.class);
+
+ // bind addresses and ports for imap and smtp
+
bind(String.class).annotatedWith(IMAPServerAddress.class).toInstance("myblog.kicks-ass.org");
+
bind(Integer.class).annotatedWith(IMAPServerPort.class).toInstance(143);
+
bind(String.class).annotatedWith(SMTPServerAddress.class).toInstance("myblog.kicks-ass.org");
+
bind(Integer.class).annotatedWith(SMTPServerPort.class).toInstance(25);
+
bind(Boolean.class).annotatedWith(SMTPAuth.class).toInstance(true);
}
}
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/AbstractSessionHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/AbstractSessionHandler.java
Thu Jul 30 11:38:16 2009
@@ -18,11 +18,12 @@
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
+import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.Session;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/DeleteMessageHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import java.util.ArrayList;
import java.util.List;
@@ -30,6 +30,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
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;
import org.apache.hupa.shared.rpc.DeleteMessage;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import java.util.ArrayList;
@@ -35,6 +35,7 @@
import org.apache.commons.lang.StringEscapeUtils;
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.IMAPMessage;
import org.apache.hupa.shared.data.MessageAttachment;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import java.util.ArrayList;
import java.util.List;
@@ -29,6 +29,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
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;
import org.apache.hupa.shared.rpc.FetchFolders;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import java.util.ArrayList;
import java.util.List;
@@ -37,6 +37,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
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.IMAPMessage;
import org.apache.hupa.shared.data.MessageHeader;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LoginSessionHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import javax.servlet.http.HttpSession;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import javax.servlet.http.HttpSession;
@@ -26,6 +26,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.logging.Log;
+import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/LogoutUserHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/LogoutUserHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/LogoutUserHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/LogoutUserHandler.java
Thu Jul 30 11:38:16 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import javax.servlet.http.HttpSession;
@@ -26,6 +26,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.logging.Log;
+import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LogoutUser;
import org.apache.hupa.shared.rpc.LogoutUserResult;
Copied: labs/hupa/src/main/java/org/apache/hupa/server/handler/NoopHandler.java
(from r798850, labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/NoopHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/NoopHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/NoopHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/handler/NoopHandler.java Thu
Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import javax.servlet.http.HttpSession;
@@ -25,6 +25,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.logging.Log;
+import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.rpc.Noop;
import org.apache.hupa.shared.rpc.NoopResult;
Copied:
labs/hupa/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java
(from r798850,
labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java?p2=labs/hupa/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java&p1=labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java&r1=798850&r2=799241&rev=799241&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/SendMessageHandler.java
Thu Jul 30 11:38:16 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.server;
+package org.apache.hupa.server.handler;
import java.io.File;
import java.io.IOException;
@@ -47,6 +47,11 @@
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.logging.Log;
+import org.apache.hupa.server.FileItemRegistry;
+import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.server.annotations.SMTPAuth;
+import org.apache.hupa.server.annotations.SMTPServerAddress;
+import org.apache.hupa.server.annotations.SMTPServerPort;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.EmptyResult;
@@ -59,21 +64,26 @@
public class SendMessageHandler extends AbstractSessionHandler<SendMessage,
EmptyResult> {
- private Log logger;
private FileItemRegistry registry;
- private IMAPStoreCache store;
+ private Properties props = new Properties();
+ private boolean auth;
+ private String address;
+ private int port;
@Inject
- public SendMessageHandler(Log logger, FileItemRegistry
registry,IMAPStoreCache store, Provider<HttpSession> provider) {
+ public SendMessageHandler(Log logger, FileItemRegistry
registry,IMAPStoreCache store, Provider<HttpSession>
provider,@SMTPServerAddress String address, @SMTPServerPort int port, @SMTPAuth
boolean auth) {
super(store,logger,provider);
this.registry = registry;
+ this.auth = auth;
+ this.address = address;
+ this.port = port;
+ props.put("mail.smtp.auth", auth);
}
public EmptyResult executeInternal(SendMessage action, ExecutionContext
context)
throws ActionException {
try {
- Properties props = new Properties();
Session session = Session.getDefaultInstance(props);
MimeMessage message = new MimeMessage(session);
@@ -123,12 +133,18 @@
message.saveChanges();
User user = getUser(action.getSessionId());
Transport transport = session.getTransport("smtp");
- transport.connect("myblog.kicks-ass.org", 25, user
- .getName(), user.getPassword());
+ if (auth) {
+ logger.debug("Use auth for smtp connection");
+
+ transport.connect(address,port,user.getName(),
user.getPassword());
+ } else {
+ transport.connect(address, port, null,null);
+ }
+ logger.info("Send message from " +
m.getHeader().getFrom()+ " to " + message.getRecipients(RecipientType.TO));
transport.sendMessage(message,
message.getAllRecipients());
// store message in sent folder
- IMAPStore iStore = store.get(user);
+ IMAPStore iStore = cache.get(user);
IMAPFolder folder = (IMAPFolder)
iStore.getFolder(org.apache.hupa.shared.data.IMAPFolder.DEFAULT_SENT);
if (folder.exists() == false) {
folder.create(IMAPFolder.READ_WRITE);
@@ -142,7 +158,9 @@
} catch (MessagingException e) {
logger.error("Error while sending message", e);
throw new ActionException("Error while sending
message");
- }
+ } catch (NullPointerException e) {
+ e.printStackTrace();
+ }
return new EmptyResult();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
