svn commit: r1203668 - /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
Author: norman
Date: Fri Nov 18 14:32:18 2011
New Revision: 1203668
URL: http://svn.apache.org/viewvc?rev=1203668view=rev
Log:
Some tiny changes to make fields final where possible
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java?rev=1203668r1=1203667r2=1203668view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
Fri Nov 18 14:32:18 2011
@@ -34,26 +34,15 @@ import org.slf4j.Logger;
*/
public class ProtocolSessionImpl implements ProtocolSession {
-private final InetSocketAddress remoteAddress;
-private Logger logger;
-private SessionLog pLog = null;
-
-protected String user;
-
-private String id;
-protected ProtocolTransport transport;
-
+private final SessionLog pLog;
+private final ProtocolTransport transport;
private final MapString, Object connectionState;
private final MapString, Object sessionState;
- private final InetSocketAddress localAddress;
+private String user;
-
public ProtocolSessionImpl(Logger logger, ProtocolTransport transport) {
this.transport = transport;
-this.remoteAddress = transport.getRemoteAddress();
-this.localAddress = transport.getRemoteAddress();
-this.logger = logger;
-this.id = transport.getId();
+this.pLog = new SessionLog(getSessionID(), logger);;
this.connectionState = new HashMapString, Object();
this.sessionState = new HashMapString, Object();
@@ -61,26 +50,26 @@ public class ProtocolSessionImpl impleme
@Override
public InetSocketAddress getLocalAddress() {
- return localAddress;
+ return transport.getLocalAddress();
}
@Override
public InetSocketAddress getRemoteAddress() {
- return remoteAddress;
+ return transport.getRemoteAddress();
}
/**
* @see org.apache.james.protocols.api.ProtocolSession#getRemoteHost()
*/
public String getRemoteHost() {
-return remoteAddress.getHostName();
+return getRemoteAddress().getHostName();
}
/**
* @see org.apache.james.protocols.api.ProtocolSession#getRemoteIPAddress()
*/
public String getRemoteIPAddress() {
-return remoteAddress.getAddress().getHostAddress();
+return getRemoteAddress().getAddress().getHostAddress();
}
/**
@@ -123,9 +112,6 @@ public class ProtocolSessionImpl impleme
* @see org.apache.james.protocols.api.ProtocolSession#getLogger()
*/
public Logger getLogger() {
-if (pLog == null) {
-pLog = new SessionLog(getSessionID(), logger);
-}
return pLog;
}
@@ -134,7 +120,7 @@ public class ProtocolSessionImpl impleme
* @see org.apache.james.protocols.api.ProtocolSession#getSessionID()
*/
public String getSessionID() {
-return id;
+return transport.getId();
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203675 - in /james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core: ./ esmtp/ fastfail/
Author: norman
Date: Fri Nov 18 14:45:49 2011
New Revision: 1203675
URL: http://svn.apache.org/viewvc?rev=1203675view=rev
Log:
Remove @deprecated code usage
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1203675r1=1203674r2=1203675view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
Fri Nov 18 14:45:49 2011
@@ -109,7 +109,7 @@ public class DataCmdHandler implements C
*/
@SuppressWarnings(unchecked)
protected SMTPResponse doDATA(SMTPSession session, String argument) {
-MailEnvelope env = createEnvelope(session, (MailAddress)
session.getState().get(SMTPSession.SENDER), new
ArrayListMailAddress((Collection)session.getState().get(SMTPSession.RCPT_LIST)));
+MailEnvelope env = createEnvelope(session, (MailAddress)
session.getState().get(SMTPSession.SENDER), new
ArrayListMailAddress((CollectionMailAddress)session.getState().get(SMTPSession.RCPT_LIST)));
session.getState().put(MAILENV, env);
session.pushLineHandler(lineHandler);
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java?rev=1203675r1=1203674r2=1203675view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
Fri Nov 18 14:45:49 2011
@@ -59,9 +59,8 @@ public class HeloCmdHandler extends Abst
COMMAND_NAME);
StringBuilder response = new StringBuilder();
response.append(session.getHelloName()).append(
- Hello ).append(parameters).append( ().append(
-session.getRemoteHost()).append( [).append(
-session.getRemoteIPAddress()).append(]));
+ Hello ).append(parameters).append( [).append(
+
session.getRemoteAddress().getAddress().getHostAddress()).append(]));
return new SMTPResponse(SMTPRetCode.MAIL_OK, response);
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java?rev=1203675r1=1203674r2=1203675view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
Fri Nov 18 14:45:49 2011
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.mailet.MailAddress;
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
@@ -62,7 +63,8 @@ public class ReceivedDataLineFilter impl
return resp;
}
-private Response addNewReceivedMailHeaders(SMTPSession session,
LineHandlerSMTPSession next) {
+@SuppressWarnings(unchecked)
+ private Response addNewReceivedMailHeaders(SMTPSession session,
LineHandlerSMTPSession next) {
StringBuilder headerLineBuffer = new StringBuilder();
String heloMode = (String) session.getConnectionState().get(
@@ -72,14 +74,14 @@ public class ReceivedDataLineFilter impl
// Put our Received header
svn commit: r1203685 - in /james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core: ./ esmtp/ fastfail/
Author: norman
Date: Fri Nov 18 15:09:15 2011
New Revision: 1203685
URL: http://svn.apache.org/viewvc?rev=1203685view=rev
Log:
cleanup a bit
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1203685r1=1203684r2=1203685view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,7 +19,9 @@
package org.apache.james.protocols.smtp.core;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -43,6 +45,8 @@ import org.apache.mailet.MailAddress;
*/
public class DataCmdHandler implements CommandHandlerSMTPSession,
ExtensibleHandler {
+ private static final CollectionString COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(DATA));
+
public static final class DataConsumerLineHandler implements
LineHandlerSMTPSession {
/**
@@ -128,10 +132,7 @@ public class DataCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public CollectionString getImplCommands() {
-CollectionString implCommands = new ArrayListString();
-implCommands.add(DATA);
-
-return implCommands;
+ return COMMANDS;
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java?rev=1203685r1=1203684r2=1203685view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -40,7 +41,7 @@ public class ExpnCmdHandler implements C
/**
* The name of the command handled by the command handler
*/
-private final static String COMMAND_NAME = EXPN;
+private static final CollectionString COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(EXPN));
/**
* Handler method called upon receipt of a EXPN command.
@@ -56,10 +57,7
svn commit: r1203750 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ api/src/main/java/org/apache/james/protocols/api/handler/ lmtp/src/main/java/org/apache/james/protoc
Author: norman
Date: Fri Nov 18 17:15:10 2011
New Revision: 1203750
URL: http://svn.apache.org/viewvc?rev=1203750view=rev
Log:
Add some generic mutable ProtocolHandlerChain implementation and fix some
javadocs
Added:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java?rev=1203750r1=1203749r2=1203750view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
Fri Nov 18 17:15:10 2011
@@ -41,6 +41,11 @@ public interface Protocol {
*/
ProtocolSession newSession(ProtocolTransport transport);
+/**
+ * Returns codetrue/code if STARTTLS is supported
+ *
+ * @return starttlsSupported
+ */
boolean isStartTLSSupported();
}
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java?rev=1203750r1=1203749r2=1203750view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
Fri Nov 18 17:15:10 2011
@@ -79,9 +79,19 @@ public interface ProtocolSession {
String getRemoteIPAddress();
-InetSocketAddress getLocalAddress();
-
+/**
+ * Return the {@link InetSocketAddress} of the remote peer
+ *
+ * @return address
+ */
InetSocketAddress getRemoteAddress();
+
+/**
+ * Return the {@link InetSocketAddress} of the local bound address
+ *
+ * @return local
+ */
+InetSocketAddress getLocalAddress();
/**
* Return the ID for the session
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java?rev=1203750r1=1203749r2=1203750view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
Fri Nov 18 17:15:10 2011
@@ -36,6 +36,11 @@ public interface ProtocolTransport {
*/
InetSocketAddress getRemoteAddress();
+/**
+ * Return the {@link InetSocketAddress} of the local bound address
+ *
+ * @return local
+ */
InetSocketAddress getLocalAddress();
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java?rev=1203750r1=1203749r2=1203750view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
Fri Nov 18 17:15:10 2011
@@ -31,11 +31,11 @@ import java.util.List;
public abstract class AbstractProtocolHandlerChain implements
ProtocolHandlerChain{
/**
-* Return a List of all Handlers
+* Return an immutable List of all Handlers
*
* @return handlerList
*/
- protected abstract ListObject getHandlers();
+ protected abstract ListProtocolHandler getHandlers();
/**
* @see
org.apache.james.protocols.api.handler.ProtocolHandlerChain#getHandlers(java.lang.Class)
@@ -43,7 +43,7
svn commit: r1203758 - /james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
Author: norman
Date: Fri Nov 18 17:35:57 2011
New Revision: 1203758
URL: http://svn.apache.org/viewvc?rev=1203758view=rev
Log:
Add constructor from super class
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java?rev=1203758r1=1203757r2=1203758view=diff
==
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
(original)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
Fri Nov 18 17:35:57 2011
@@ -37,13 +37,22 @@ import org.apache.james.protocols.smtp.c
import org.apache.james.protocols.smtp.core.VrfyCmdHandler;
import org.apache.james.protocols.smtp.core.esmtp.MailSizeEsmtpExtension;
import org.apache.james.protocols.smtp.core.esmtp.StartTlsCmdHandler;
+import org.apache.james.protocols.smtp.hook.Hook;
public class LMTPProtocolHandlerChain extends SMTPProtocolHandlerChain{
-public LMTPProtocolHandlerChain() throws WiringException {
+public LMTPProtocolHandlerChain() {
super();
}
+public LMTPProtocolHandlerChain(boolean addDefault) {
+super(addDefault);
+}
+
+public LMTPProtocolHandlerChain(Hook... hooks) throws WiringException {
+super(hooks);
+}
+
@Override
protected ListProtocolHandler initDefaultHandlers() {
ListProtocolHandler defaultHandlers = new
ArrayListProtocolHandler();
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203764 - in /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler: AbstractProtocolHandlerChain.java ProtocolHandlerChain.java ProtocolHandlerChainImpl.java
Author: norman
Date: Fri Nov 18 17:41:14 2011
New Revision: 1203764
URL: http://svn.apache.org/viewvc?rev=1203764view=rev
Log:
Replace tabs by spaces
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java?rev=1203764r1=1203763r2=1203764view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
Fri Nov 18 17:41:14 2011
@@ -30,13 +30,13 @@ import java.util.List;
*/
public abstract class AbstractProtocolHandlerChain implements
ProtocolHandlerChain{
- /**
-* Return an immutable List of all Handlers
-*
-* @return handlerList
-*/
- protected abstract ListProtocolHandler getHandlers();
-
+/**
+ * Return an immutable List of all Handlers
+ *
+ * @return handlerList
+ */
+protected abstract ListProtocolHandler getHandlers();
+
/**
* @see
org.apache.james.protocols.api.handler.ProtocolHandlerChain#getHandlers(java.lang.Class)
*/
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java?rev=1203764r1=1203763r2=1203764view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java
Fri Nov 18 17:41:14 2011
@@ -36,6 +36,6 @@ public interface ProtocolHandlerChain {
* @param type the type of handler we're interested in
* @return a List of handlers
*/
-abstract T LinkedListT getHandlers(ClassT type);
+T LinkedListT getHandlers(ClassT type);
}
\ No newline at end of file
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java?rev=1203764r1=1203763r2=1203764view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
Fri Nov 18 17:41:14 2011
@@ -27,247 +27,247 @@ import java.util.List;
import java.util.ListIterator;
/**
- * {@link AbstractProtocolHandlerChain} which is mutable till the {@link
#wireExtensibleHandlers()} is called. After that all operations
- * which try to modify the instance will throw and {@link
UnsupportedOperationException}
+ * {@link AbstractProtocolHandlerChain} which is mutable till the
+ * {@link #wireExtensibleHandlers()} is called. After that all operations which
+ * try to modify the instance will throw and
+ * {@link UnsupportedOperationException}
+ *
*
- *
*/
-public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain
implements ListProtocolHandler{
+public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain
implements ListProtocolHandler {
+
+private final ListProtocolHandler handlers = new
ArrayListProtocolHandler();
+private volatile boolean readyOnly = false;
+
+/**
+ * Once this is called all tries to modify this
+ * {@link ProtocolHandlerChainImpl} will throw an
+ * {@link UnsupportedOperationException}
+ */
+@Override
+public void wireExtensibleHandlers() throws WiringException {
+super.wireExtensibleHandlers();
+readyOnly = true;
+}
+
+protected final boolean isReadyOnly() {
+return readyOnly;
+}
+
+public boolean add(ProtocolHandler handler) {
+if (readyOnly) {
+throw new UnsupportedOperationException(Ready-only);
+}
+return handlers.add(handler);
+}
+
+@Override
+protected ListProtocolHandler getHandlers() {
+return
svn commit: r1203767 - in /james/protocols/trunk/smtp/src: main/java/org/apache/james/protocols/smtp/ test/java/org/apache/james/protocols/smtp/ test/java/org/apache/james/protocols/smtp/core/fastfail
Author: norman
Date: Fri Nov 18 17:49:21 2011
New Revision: 1203767
URL: http://svn.apache.org/viewvc?rev=1203767view=rev
Log:
Fix compile error in smtp module introduced by refactoring
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?rev=1203767r1=1203766r2=1203767view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
Fri Nov 18 17:49:21 2011
@@ -20,8 +20,8 @@ package org.apache.james.protocols.smtp;
import java.util.Collection;
+import org.apache.james.protocols.api.ProtocolSessionImpl;
import org.apache.james.protocols.api.ProtocolTransport;
-import org.apache.james.protocols.api.AbstractSession;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPConfiguration;
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
/**
* {@link SMTPSession} implementation
*/
-public class SMTPSessionImpl extends AbstractSession implements SMTPSession {
+public class SMTPSessionImpl extends ProtocolSessionImpl implements
SMTPSession {
public final static String SMTP_SESSION = SMTP_SESSION;
private boolean relayingAllowed;
@@ -72,14 +72,14 @@ public class SMTPSessionImpl extends Abs
* @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler()
*/
public void popLineHandler() {
-transport.popLineHandler();
+getProtocolTransport().popLineHandler();
}
/**
* @see
org.apache.james.protocols.smtp.SMTPSession#pushLineHandler(LineHandler)
*/
public void pushLineHandler(LineHandlerSMTPSession
overrideCommandHandler) {
-transport.pushLineHandler(overrideCommandHandler, this);
+getProtocolTransport().pushLineHandler(overrideCommandHandler, this);
}
/**
@@ -122,7 +122,7 @@ public class SMTPSessionImpl extends Abs
* @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported()
*/
public boolean isAuthSupported() {
-return
theConfigData.isAuthRequired(socketAddress.getAddress().getHostAddress());
+return
theConfigData.isAuthRequired(getRemoteAddress().getAddress().getHostAddress());
}
/**
@@ -151,7 +151,7 @@ public class SMTPSessionImpl extends Abs
* org.apache.james.protocols.smtp.SMTPSession#getPushedLineHandlerCount()
*/
public int getPushedLineHandlerCount() {
-return transport.getPushedLineHandlerCount();
+return getProtocolTransport().getPushedLineHandlerCount();
}
public Response newLineTooLongResponse() {
Modified:
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1203767r1=1203766r2=1203767view=diff
==
---
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
(original)
+++
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
Fri Nov 18 17:49:21 2011
@@ -22,6 +22,7 @@ package org.apache.james.protocols.smtp;
import java.io.IOException;
import java.io.InputStream;
+import java.net.InetSocketAddress;
import java.util.Map;
import org.apache.james.protocols.api.Response;
@@ -214,4 +215,16 @@ public class BaseFakeSMTPSession impleme
throw new UnsupportedOperationException(Unimplemented Stub Method);
}
+@Override
+public InetSocketAddress getRemoteAddress() {
+throw new UnsupportedOperationException(Unimplemented Stub Method);
+
+}
+
+@Override
+public InetSocketAddress getLocalAddress() {
+throw new UnsupportedOperationException(Unimplemented Stub Method);
+
+}
+
}
Modified:
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java?rev=1203767r1=1203766r2
svn commit: r1203768 - /james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
Author: norman
Date: Fri Nov 18 17:53:40 2011
New Revision: 1203768
URL: http://svn.apache.org/viewvc?rev=1203768view=rev
Log:
Throw exception when try to add handlers after handlers are wired
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java?rev=1203768r1=1203767r2=1203768view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
Fri Nov 18 17:53:40 2011
@@ -112,6 +112,9 @@ public class SMTPProtocolHandlerChain ex
private boolean checkForAuth(ProtocolHandler handler) {
+if (isReadyOnly()) {
+throw new UnsupportedOperationException(Read-Only);
+}
if (handler instanceof AuthHook !authHandler) {
if (!add(new AuthCmdHandler())) {
return false;
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
Re: Forking tests
I habe no real preference... BtW, any plan to star the release for james-project 1.8 soon? thanks, norman Am Freitag, 18. November 2011 schrieb Felix Knecht fe...@otego.com: On 11/18/2011 08:18 PM, Manuel Carrasco Mońino wrote: I agree, this mode is better when running emma:emma though Emma will be replaced by cobertura anyway. On Fri, Nov 18, 2011 at 3:54 PM, Felix Knechtfe...@otego.com wrote: Hi all What's the default preferred forkMode for test execution? I suggest always to have more independent tests. Any objections? Thanks Felix [1] http://maven.apache.org/**plugins/maven-surefire-plugin/** test-mojo.html#forkMode http://maven.apache.org/plugins/maven-surefire-plugin/test-mojo.html#forkMode --**--**- To unsubscribe, e-mail: server-dev-unsubscribe@james.**apache.org server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-help@james.apache.**org server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: Forking tests
Release often release often 2011/11/18, Felix Knecht fe...@otego.com: On 11/18/2011 08:24 PM, Norman Maurer wrote: I habe no real preference... BtW, any plan to star the release for james-project 1.8 soon? If wanted I can start immediately. thanks, norman Am Freitag, 18. November 2011 schrieb Felix Knechtfe...@otego.com: On 11/18/2011 08:18 PM, Manuel Carrasco Mońino wrote: I agree, this mode is better when running emma:emma though Emma will be replaced by cobertura anyway. On Fri, Nov 18, 2011 at 3:54 PM, Felix Knechtfe...@otego.com wrote: Hi all What's the default preferred forkMode for test execution? I suggest always to have more independent tests. Any objections? Thanks Felix [1] http://maven.apache.org/**plugins/maven-surefire-plugin/** test-mojo.html#forkMode http://maven.apache.org/plugins/maven-surefire-plugin/test-mojo.html#forkMode --**--**- To unsubscribe, e-mail: server-dev-unsubscribe@james.**apache.org server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-help@james.apache.**org server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: [VOTE] Release TLP (pom.xml) Apache James Project 1.8
+1 norman Am Freitag, 18. November 2011 schrieb Felix Knecht fe...@otego.com: Hi A list of main changes/fixes: - Replace the emma plugin by the cobertura plugin for review code coverage. The emma plugin causes problems when it comes to multi-module projects. Please cast you vote for release TLP (pom.xml) Apache James Project 1.8 Release for review: https://repository.apache.org/content/repositories/orgapachejames-221/ [ ] +1 Please release [ ] +0 No time to review [ ] -1 Something wrong which blocks the release. Thanks and regards Felix - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: EMMA plugin (was svn commit: r1185659 - /james/project/trunk/pom.xml)
I think a) is the way to go then. I dont think we need to take special care here about the license... thanks, norman Am Donnerstag, 17. November 2011 schrieb Felix Knecht fe...@otego.com: After all it looks like there are comming up some unexpected problems using the EMMA plugin instead if the cobertura plugin: - Multi module projects are not really supported (or it's simply too old or not really maven 3.x compatible). When running specific goals in a submodule for the maven-jar-plugin e.g. the instrumentation goal must be run in the submodule again and it must be executed after the additional jar-plugin goals. There are more of the same problems - that's not a clean, clear way to go - Report generation seems to be also problematical when it comes to multi-module projects. Because of the mentioned above the report generation may fail and the error says instrumentation has already been done - looks like a chicken-egg problem - The described problems above to not only have impacts on the module itself, but also for projects using a the jar of such a module as dependency (see also Normans mail [1] - thanks for bringing up this problem). Sorry about being too enhousiastic putting the EMMA-plugin into the lately released TLP pom.xml :-/ IMO we should a) either use the cobertura plugin as it is only used for report generation and code review (I'm not aware that it's needed in any James project to build a distribution) b) do code review without knowing about test code coverage c) find another suitable plugin for this (what I haven't up to now) and finally a), b) or c) will need to find the way into the next (soon) release of the TLP pom.xml WDOT? Thanks and regards Felix [1] http://www.mail-archive.com/server-dev@james.apache.org/msg36812.html On 10/20/2011 12:42 PM, Stefano Bagnara wrote: 2011/10/20 Felix Knechtfel...@apache.org: On 10/18/2011 04:42 PM, Stefano Bagnara wrote: 2011/10/18fel...@apache.org: Author: felixk Date: Tue Oct 18 13:52:43 2011 New Revision: 1185659 URL: http://svn.apache.org/viewvc?rev=1185659view=rev Log: Both (emma / cobertura) plugins are for measure of codecoverage of tests. Using only one of the plugins should fullfill the needs. If I've chosen for any reasons the wrong one please let me know. For now I left cobertura plugin. AFAIK cobertura is GPL while emma is CPL. As long as we don't bundle them and don't require them to build our products we should be fine with both, but I guess that if in doubt we should better choose emma as CPL is a category B license (http://www.apache.org/legal/3party.html). I thought the cobertura plugin to be of Apache license: http://mojo.codehaus.org/cobertura-maven-plugin/license.html The plugin is Apache Licensed but the cobertura jar is GPL It is also correctly reported in the dependency report: http://mojo.codehaus.org/cobertura-maven-plugin/dependencies.html But the right place to look for the license is here: http://cobertura.sourceforge.net/license.html The Cobertura ant tasks are licensed under the Apache Software License, Version 1.1. The rest of Cobertura is licensed under the GNU General Public License, Version 2.0. See below for detailed explanations. And as you can see the cobertura license page has a long explanation and concludes with an it all depends on how you interpret the license. AFAICS it's only used to generate reports and it's not required to build the product itself but for code review. I can find other Apache projects using this plugin also - but this doesn't means that it's the way to go for us and I'm not an expert in such things. Can anybody say more about this? What does cobertura gives us more than emma? If there is no reason to use cobertura instead of emma why don't we simply keep emma (you commit message sounds like you randomly chose one) so we don't waste time trying to give answers to the complex licensing stuff? (I believe we are safe to produce reports with a GPL product, but I'm not a lawyer, and I like emma) If, instead, we have good reasons to prefer cobertura then it makes sense to ask Robert (he's the most experienced in our team, wrt licensing) and maybe file an issue to ASF LEGAL jira project. Stefano - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203348 - /james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
Author: norman
Date: Thu Nov 17 20:09:19 2011
New Revision: 1203348
URL: http://svn.apache.org/viewvc?rev=1203348view=rev
Log:
Allow to use no arg constructor
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java?rev=1203348r1=1203347r2=1203348view=diff
==
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
Thu Nov 17 20:09:19 2011
@@ -55,6 +55,9 @@ public class POP3Response extends Abstra
public POP3Response(String code) {
this(code, null);
}
+
+protected POP3Response() {
+}
/**
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JSPF-94) Add support for IFutureSPFResultListener
Add support for IFutureSPFResultListener Key: JSPF-94 URL: https://issues.apache.org/jira/browse/JSPF-94 Project: JAMES jSPF Issue Type: New Feature Components: Core Affects Versions: 0.9.9 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.0 We should allow to register a Listener which will notified oncea FutureSPFResult becomes ready. This allows better support in async enviroment -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1202747 - /james/jspf/trunk/resolver/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java
Author: norman
Date: Wed Nov 16 15:47:08 2011
New Revision: 1202747
URL: http://svn.apache.org/viewvc?rev=1202747view=rev
Log:
Add support for IFutureSPFResultListener. See JSPF-94
Modified:
james/jspf/trunk/resolver/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java
Modified:
james/jspf/trunk/resolver/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/resolver/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java?rev=1202747r1=1202746r2=1202747view=diff
==
---
james/jspf/trunk/resolver/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java
(original)
+++
james/jspf/trunk/resolver/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java
Wed Nov 16 15:47:08 2011
@@ -19,6 +19,9 @@
package org.apache.james.jspf.executor;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.james.jspf.core.SPFSession;
@@ -29,6 +32,8 @@ import org.apache.james.jspf.core.SPFSes
public class FutureSPFResult extends SPFResult {
private boolean isReady;
+private ListIFutureSPFResultListener listeners;
+private int waiters;
public FutureSPFResult() {
isReady = false;
@@ -41,9 +46,21 @@ public class FutureSPFResult extends SPF
*
*/
public synchronized void setSPFResult(SPFSession session) {
-setSPFSession(session);
-isReady = true;
-notify();
+if (!isReady) {
+setSPFSession(session);
+isReady = true;
+if (waiters 0) {
+notifyAll();
+}
+if (listeners != null) {
+for (IFutureSPFResultListener listener : listeners) {
+listener.onSPFResult(this);
+}
+}
+listeners = null;
+}
+
+
}
/**
@@ -53,9 +70,13 @@ public class FutureSPFResult extends SPF
private synchronized void checkReady() {
while (!isReady) {
try {
+waiters++;
wait();
} catch (InterruptedException e) {
-//
+//
+Thread.interrupted();
+} finally {
+waiters--;
}
}
}
@@ -108,4 +129,47 @@ public class FutureSPFResult extends SPF
public synchronized boolean isReady() {
return isReady;
}
+
+/**
+ * Add a {@link IFutureSPFResultListener} which will get notified once
{@link #isReady()} returns codetrue/code
+ *
+ * @param listener
+ */
+public synchronized void addListener(IFutureSPFResultListener listener) {
+if (!isReady) {
+if (listeners == null) {
+listeners = new ArrayListIFutureSPFResultListener();
+}
+listeners.add(listener);
+} else {
+listener.onSPFResult(this);
+}
+}
+
+/**
+ * Remove a {@link IFutureSPFResultListener}
+ *
+ * @param listener
+ */
+public synchronized void removeListener(IFutureSPFResultListener listener)
{
+if (listeners != null) {
+listeners.remove(listener);
+}
+}
+
+
+/**
+ * Listener which will get notified once a {@link
FutureSPFResult#isReady()} returns codetrue/code. So it will not block
anymore
+ *
+ *
+ */
+public interface IFutureSPFResultListener {
+
+/**
+ * Get called once a {@link FutureSPFResult} is ready
+ *
+ * @param result
+ */
+void onSPFResult(FutureSPFResult result);
+}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JSPF-94) Add support for IFutureSPFResultListener
[ https://issues.apache.org/jira/browse/JSPF-94?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JSPF-94. --- Resolution: Fixed Add support for IFutureSPFResultListener Key: JSPF-94 URL: https://issues.apache.org/jira/browse/JSPF-94 Project: JAMES jSPF Issue Type: New Feature Components: Core Affects Versions: 0.9.9 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.0 We should allow to register a Listener which will notified oncea FutureSPFResult becomes ready. This allows better support in async enviroment -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Problems because of emma plugin
Hi there, after the last changes related to the emma-plugin I see strange problems in niosmtp (which uses protocols snapshots in its unit tests). If I don't specify the emma jar as test dependency it fails to init the protocols classes. For me it seems like the protocols jar contains the emma instrumented classes and not the original one. @Felix: Could you have a look ? You can see the effect by comment the emma dependency in niosmtp and try to run mvn clean package. The niosmtp source can be found here: https://github.com/normanmaurer/niosmtp Thanks, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1199394 - /james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Author: norman
Date: Tue Nov 8 19:22:37 2011
New Revision: 1199394
URL: http://svn.apache.org/viewvc?rev=1199394view=rev
Log:
Log auth failures with info level. See PROTOCOLS-47
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1199394r1=1199393r2=1199394view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Tue Nov 8 19:22:37 2011
@@ -338,7 +338,7 @@ public class AuthCmdHandler
if (res != null) {
if (SMTPRetCode.AUTH_FAILED.equals(res.getRetCode())) {
-session.getLogger().error(AUTH method +authType+
failed);
+session.getLogger().info(AUTH method +authType+
failed);
} else if (SMTPRetCode.AUTH_OK.equals(res.getRetCode())) {
if (session.getLogger().isDebugEnabled()) {
// TODO: Make this string a more useful debug
message
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-47) Change log level from ERROR to INFO for AUTH method LOGIN failed
[ https://issues.apache.org/jira/browse/PROTOCOLS-47?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-47. Resolution: Fixed Fix Version/s: 1.6-beta3 Change log level from ERROR to INFO for AUTH method LOGIN failed -- Key: PROTOCOLS-47 URL: https://issues.apache.org/jira/browse/PROTOCOLS-47 Project: JAMES Protocols Issue Type: New Feature Components: smtp Reporter: Zach Cox Assignee: Norman Maurer Fix For: 1.6-beta3 The message AUTH method LOGIN failed is currently logged at ERROR. Please change this to a lower level, such as INFO. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Assigned] (IMAP-349) javax.mail.FolderNotFoundException: inbox not found when reading from lowercase inbox folder
[ https://issues.apache.org/jira/browse/IMAP-349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer reassigned IMAP-349: -- Assignee: Norman Maurer javax.mail.FolderNotFoundException: inbox not found when reading from lowercase inbox folder Key: IMAP-349 URL: https://issues.apache.org/jira/browse/IMAP-349 Project: JAMES Imap Issue Type: Bug Components: Mailbox Affects Versions: 0.3 Reporter: Phanidhar Assignee: Norman Maurer the default folder is case sensitive for IMAP. Was able to successfully connect and read emails using upper case INBOX but lower inbox gives the following error. javax.mail.FolderNotFoundException: inbox not found at com.sun.mail.imap.IMAPFolder.checkExists(IMAPFolder.java:219) at com.sun.mail.imap.IMAPFolder.open(IMAPFolder.java:739) at ReadMail.processMail(ReadMail.java:60) at ReadMail.init(ReadMail.java:19) at ReadMail.main(ReadMail.java:167) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1197678 - /james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Author: norman
Date: Fri Nov 4 17:26:42 2011
New Revision: 1197678
URL: http://svn.apache.org/viewvc?rev=1197678view=rev
Log:
Make sure inbox is converted to INBOX. See IMAP-349
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1197678r1=1197677r2=1197678view=diff
==
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Fri Nov 4 17:26:42 2011
@@ -381,6 +381,13 @@ abstract public class AbstractMailboxPro
if (namespace.equals(MailboxConstants.USER_NAMESPACE)) {
user = ImapSessionUtils.getUserName(session);
}
+
+// use uppercase for INBOX
+//
+// See IMAP-349
+if (name.equalsIgnoreCase(MailboxConstants.INBOX)) {
+name = MailboxConstants.INBOX;
+}
return new MailboxPath(namespace, user, name);
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (IMAP-349) javax.mail.FolderNotFoundException: inbox not found when reading from lowercase inbox folder
[ https://issues.apache.org/jira/browse/IMAP-349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved IMAP-349. Resolution: Fixed Fix Version/s: 0.3 javax.mail.FolderNotFoundException: inbox not found when reading from lowercase inbox folder Key: IMAP-349 URL: https://issues.apache.org/jira/browse/IMAP-349 Project: JAMES Imap Issue Type: Bug Components: Mailbox Affects Versions: 0.3 Reporter: Phanidhar Assignee: Norman Maurer Fix For: 0.3 the default folder is case sensitive for IMAP. Was able to successfully connect and read emails using upper case INBOX but lower inbox gives the following error. javax.mail.FolderNotFoundException: inbox not found at com.sun.mail.imap.IMAPFolder.checkExists(IMAPFolder.java:219) at com.sun.mail.imap.IMAPFolder.open(IMAPFolder.java:739) at ReadMail.processMail(ReadMail.java:60) at ReadMail.init(ReadMail.java:19) at ReadMail.main(ReadMail.java:167) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1197680 - /james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Author: norman
Date: Fri Nov 4 17:30:23 2011
New Revision: 1197680
URL: http://svn.apache.org/viewvc?rev=1197680view=rev
Log:
cleanup
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1197680r1=1197679r2=1197680view=diff
==
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Fri Nov 4 17:30:23 2011
@@ -137,10 +137,6 @@ abstract public class AbstractMailboxPro
}
}
-/**
- * TODO This method is in no interface declared and referenced only 5
lines above in this module.
- * Should this be a protected or even a private method?
- */
private void unsolicitedResponses(final ImapSession session, final
ImapProcessor.Responder responder, final SelectedMailbox selected, boolean
omitExpunged, boolean useUid) {
final boolean sizeChanged = selected.isSizeChanged();
// New message response
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1197721 - /james/server/trunk/pom.xml
Author: norman
Date: Fri Nov 4 19:15:31 2011
New Revision: 1197721
URL: http://svn.apache.org/viewvc?rev=1197721view=rev
Log:
Move to protocols 1.6-beta2
Modified:
james/server/trunk/pom.xml
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1197721r1=1197720r2=1197721view=diff
==
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Nov 4 19:15:31 2011
@@ -114,7 +114,7 @@
mailbox.version0.4-SNAPSHOT/mailbox.version
imap.version0.3-SNAPSHOT/imap.version
james.server.version${project.version}/james.server.version
-protocols.version1.6-beta1/protocols.version
+protocols.version1.6-beta2/protocols.version
jsieve.version0.4/jsieve.version
jackrabbit.version2.2.5/jackrabbit.version
hbase.version0.90.3/hbase.version
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1197723 - /james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
Author: norman
Date: Fri Nov 4 19:33:14 2011
New Revision: 1197723
URL: http://svn.apache.org/viewvc?rev=1197723view=rev
Log:
Adjustment for protocols 1.6-beta2
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1197723r1=1197722r2=1197723view=diff
==
---
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
(original)
+++
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
Fri Nov 4 19:33:14 2011
@@ -28,7 +28,7 @@ import org.apache.james.lmtpserver.jmx.J
import org.apache.james.protocols.api.handler.HandlersPackage;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
import org.apache.james.protocols.lmtp.LMTPConfiguration;
-import org.apache.james.protocols.lmtp.LMTPProtocol;
+import org.apache.james.protocols.smtp.SMTPProtocol;
import org.apache.james.smtpserver.netty.SMTPChannelUpstreamHandler;
import org.jboss.netty.channel.ChannelUpstreamHandler;
@@ -105,6 +105,13 @@ public class LMTPServer extends Abstract
return LMTPServer.this.lmtpGreeting;
}
+
+
+@Override
+public boolean isStartTLSSupported() {
+return false;
+}
+
}
@@ -140,7 +147,7 @@ public class LMTPServer extends Abstract
@Override
protected ChannelUpstreamHandler createCoreHandler() {
-LMTPProtocol protocol = new LMTPProtocol(getProtocolHandlerChain(),
lmtpConfig);
+SMTPProtocol protocol = new SMTPProtocol(getProtocolHandlerChain(),
lmtpConfig);
return new SMTPChannelUpstreamHandler(protocol, getLogger());
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
Re: [VOTE] Release TLP (pom.xml) Apache James Project 1.7
+1 Bye Norman 2011/11/1, Felix Knecht fe...@otego.com: Hi A list of main changes/fixes: - Moving legacy documentation to branches tree - Merge james-parent.pom and james-project.pom into james-project.pom - Merge pluginManagement sections of all James projects into TLP pom.xml - Update plugins to latest version - Replace weare.xml by merging developers and contributors into pom.xml and let the report be generated by the project-info-report plugin - Simplify the switch mechanism for site / technical-site generation - Remove inherited definitions - Replace cobertura-plugin with emma-plugin - Use latest apache pom as parent - Set target JDK 1.6 as default - Add wagon-ssh-external extension to make site-deploy via ssh (scp) using ssh-agents working Please cast you vote for release TLP (pom.xml) Apache James Project 1.7 Release for review: https://repository.apache.org/content/repositories/orgapachejames-135/ [ ] +1 Please release [ ] +0 No time to review [ ] -1 Something wrong which blocks the release. Thanks and regards Felix - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: [VOTE] Apache James Protocols 1.6-beta2 (second take)
Hi there, the vote passed. +1 Felix, Ioan, Robert, Stefano, Norman, Eric, Manuel Thanks to everyone for voting :) I will publish the artifacts to maven repos and dist directory. Bye, Norman 2011/10/27 Norman Maurer norman.mau...@googlemail.com: Hi there, after fixing some last minute bugs we are ready for re-roll Apache James Protocols 1.6-beta2. So please cast your VOTE. Artifacts: https://repository.apache.org/content/repositories/orgapachejames-107/ [ ] +1 Yes do it now! [ ] +0 No time to review [ ] -1 Something wrong with the artifacts Bye, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (PROTOCOLS-46) HashedWheelTimer get not stopped on AbstractAsyncServer.unbind()
HashedWheelTimer get not stopped on AbstractAsyncServer.unbind() Key: PROTOCOLS-46 URL: https://issues.apache.org/jira/browse/PROTOCOLS-46 Project: JAMES Protocols Issue Type: Bug Affects Versions: 1.6-beta2 Reporter: Norman Maurer Assignee: Norman Maurer -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1194972 - in /james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl: AbstractAsyncServer.java AbstractChannelPipelineFactory.java
Author: norman
Date: Sat Oct 29 18:57:43 2011
New Revision: 1194972
URL: http://svn.apache.org/viewvc?rev=1194972view=rev
Log:
Stop Timer on unbind. See PROTOCOLS-46
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java?rev=1194972r1=1194971r2=1194972view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java
Sat Oct 29 18:57:43 2011
@@ -31,6 +31,7 @@ import org.jboss.netty.channel.group.Cha
import org.jboss.netty.channel.group.DefaultChannelGroup;
import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.util.ExternalResourceReleasable;
/**
* Abstract base class for Servers which want to use async io
@@ -122,6 +123,10 @@ public abstract class AbstractAsyncServe
*/
public synchronized void unbind() {
if (started == false) return;
+ChannelPipelineFactory factory = bootstrap.getPipelineFactory();
+if (factory instanceof ExternalResourceReleasable) {
+((ExternalResourceReleasable) factory).releaseExternalResources();
+}
channels.close().awaitUninterruptibly();
bootstrap.releaseExternalResources();
started = false;
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java?rev=1194972r1=1194971r2=1194972view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java
Sat Oct 29 18:57:43 2011
@@ -28,6 +28,7 @@ import org.jboss.netty.handler.codec.fra
import org.jboss.netty.handler.codec.frame.Delimiters;
import org.jboss.netty.handler.execution.ExecutionHandler;
import org.jboss.netty.handler.stream.ChunkedWriteHandler;
+import org.jboss.netty.util.ExternalResourceReleasable;
import org.jboss.netty.util.HashedWheelTimer;
/**
@@ -35,7 +36,7 @@ import org.jboss.netty.util.HashedWheelT
*
*
*/
-public abstract class AbstractChannelPipelineFactory implements
ChannelPipelineFactory{
+public abstract class AbstractChannelPipelineFactory implements
ChannelPipelineFactory, ExternalResourceReleasable{
public final static int MAX_LINE_LENGTH = 8192;
private final ConnectionLimitUpstreamHandler connectionLimitHandler;
@@ -98,6 +99,11 @@ public abstract class AbstractChannelPip
* @return coreHandeler
*/
protected abstract ChannelUpstreamHandler createHandler();
+
+@Override
+public void releaseExternalResources() {
+timer.stop();
+}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-46) HashedWheelTimer get not stopped on AbstractAsyncServer.unbind()
[ https://issues.apache.org/jira/browse/PROTOCOLS-46?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-46. Resolution: Fixed Fix Version/s: 1.6-beta3 HashedWheelTimer get not stopped on AbstractAsyncServer.unbind() Key: PROTOCOLS-46 URL: https://issues.apache.org/jira/browse/PROTOCOLS-46 Project: JAMES Protocols Issue Type: Bug Affects Versions: 1.6-beta2 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta3 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: [VOTE] Apache James Protocols 1.6-beta2 (second take)
[x] +1 Yes do it now! Bye, Norman 2011/10/27 Norman Maurer norman.mau...@googlemail.com: Hi there, after fixing some last minute bugs we are ready for re-roll Apache James Protocols 1.6-beta2. So please cast your VOTE. Artifacts: https://repository.apache.org/content/repositories/orgapachejames-107/ [ ] +0 No time to review [ ] -1 Something wrong with the artifacts Bye, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189698 - /james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
Author: norman
Date: Thu Oct 27 10:11:55 2011
New Revision: 1189698
URL: http://svn.apache.org/viewvc?rev=1189698view=rev
Log:
Make sure the LineHandler is removed from the session once the extensions were
processed. See PROTOCOLS-44
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java?rev=1189698r1=1189697r2=1189698view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
Thu Oct 27 10:11:55 2011
@@ -67,6 +67,7 @@ public class DataLineMessageHookHandler
out.close();
Response response = processExtensions(session, env);
+session.popLineHandler();
session.resetState();
return response;
@@ -99,46 +100,43 @@ public class DataLineMessageHookHandler
* @param session
*/
protected Response processExtensions(SMTPSession session, MailEnvelopeImpl
mail) {
-try {
+
-if (mail != null messageHandlers != null) {
-int count = messageHandlers.size();
-for (int i = 0; i count; i++) {
-MessageHook rawHandler = (MessageHook)
messageHandlers.get(i);
-session.getLogger().debug(executing message handler +
rawHandler);
-
-long start = System.currentTimeMillis();
-HookResult hRes = rawHandler.onMessage(session, mail);
-long executionTime = System.currentTimeMillis() - start;
-
-if (rHooks != null) {
-for (int i2 = 0; i2 rHooks.size(); i2++) {
-Object rHook = rHooks.get(i2);
-session.getLogger().debug(executing hook +
rHook);
+if (mail != null messageHandlers != null) {
+int count = messageHandlers.size();
+for (int i = 0; i count; i++) {
+MessageHook rawHandler = (MessageHook) messageHandlers.get(i);
+session.getLogger().debug(executing message handler +
rawHandler);
+
+long start = System.currentTimeMillis();
+HookResult hRes = rawHandler.onMessage(session, mail);
+long executionTime = System.currentTimeMillis() - start;
+
+if (rHooks != null) {
+for (int i2 = 0; i2 rHooks.size(); i2++) {
+Object rHook = rHooks.get(i2);
+session.getLogger().debug(executing hook + rHook);
-hRes = ((HookResultHook)
rHook).onHookResult(session, hRes, executionTime, rawHandler);
-}
+hRes = ((HookResultHook) rHook).onHookResult(session,
hRes, executionTime, rawHandler);
}
+}
-SMTPResponse response =
AbstractHookableCmdHandler.calcDefaultSMTPResponse(hRes);
+SMTPResponse response =
AbstractHookableCmdHandler.calcDefaultSMTPResponse(hRes);
-// if the response is received, stop processing of command
-// handlers
-if (response != null) {
-return response;
-}
+// if the response is received, stop processing of command
+// handlers
+if (response != null) {
+return response;
}
+}
-// Not queue the message!
-SMTPResponse response =
AbstractHookableCmdHandler.calcDefaultSMTPResponse(new
HookResult(HookReturnCode.DENY));
-return response;
+// Not queue the message!
+SMTPResponse response =
AbstractHookableCmdHandler.calcDefaultSMTPResponse(new
HookResult(HookReturnCode.DENY));
+return response;
-}
-} finally {
-
-session.popLineHandler();
}
+
return null;
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (PROTOCOLS-44) LMTPDataLineMessageHookHandler does not remove itself from the session once it is done
LMTPDataLineMessageHookHandler does not remove itself from the session once it is done -- Key: PROTOCOLS-44 URL: https://issues.apache.org/jira/browse/PROTOCOLS-44 Project: JAMES Protocols Issue Type: Bug Components: lmtp Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta2 The LMTPDataLineMessageHookHandler does not call session.popLineHandler() once it is done with processing the extensions. This leads to problems once a LMTP client will send more then one message per connection -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[CANCEL] [VOTE] Release Apache James Protocol 1.6-beta2
Hi there, I cancel this VOTE as I found a serious and a minor bug in LMTP today. I will commit a fix and reroll later today. Thaks, Norman 2011/10/27 Eric Charles e...@apache.org: [x] +1 Yes please release Eric On 26/10/11 20:43, Norman Maurer wrote: Hi there, I would like to release Apache James Protocols 1.6-beta2 as soon as possible ;) I fixed a few bugs which could lead to performance problems. So please review and cut your vote. Changes: https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=truejqlQuery=project+%3D+PROTOCOLS+AND+fixVersion+%3D+%221.6-beta2%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESCmode=hide Artifacts: https://repository.apache.org/content/repositories/orgapachejames-097/ [ ] +1 Yes please release [ ] +0 No time to review [ ] -1 Something wrong Thanks, Norman Ps: Release often, release early ;) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org -- Eric http://about.echarles.net - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189699 - in /james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp: LMTPConfiguration.java LMTPConfigurationImpl.java LMTPProtocol.java LMTPProtocolHandlerChain.java
Author: norman
Date: Thu Oct 27 10:15:56 2011
New Revision: 1189699
URL: http://svn.apache.org/viewvc?rev=1189699view=rev
Log:
Support STARTTLS in LMTP too. See PROTOCOLS-45
Removed:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocol.java
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java?rev=1189699r1=1189698r2=1189699view=diff
==
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
(original)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
Thu Oct 27 10:15:56 2011
@@ -50,9 +50,12 @@ public abstract class LMTPConfiguration
return false;
}
+
@Override
public boolean isStartTLSSupported() {
return false;
}
+
+
}
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java?rev=1189699r1=1189698r2=1189699view=diff
==
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
(original)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
Thu Oct 27 10:15:56 2011
@@ -52,5 +52,4 @@ public class LMTPConfigurationImpl exten
public void setGreeting(String greeting) {
this.greeting = greeting;
}
-
}
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java?rev=1189699r1=1189698r2=1189699view=diff
==
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
(original)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
Thu Oct 27 10:15:56 2011
@@ -35,6 +35,7 @@ import org.apache.james.protocols.smtp.c
import org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler;
import org.apache.james.protocols.smtp.core.VrfyCmdHandler;
import org.apache.james.protocols.smtp.core.esmtp.MailSizeEsmtpExtension;
+import org.apache.james.protocols.smtp.core.esmtp.StartTlsCmdHandler;
public class LMTPProtocolHandlerChain extends SMTPProtocolHandlerChain{
@@ -60,6 +61,7 @@ public class LMTPProtocolHandlerChain ex
defaultHandlers.add(new WelcomeMessageHandler());
defaultHandlers.add(new ReceivedDataLineFilter());
defaultHandlers.add(new LMTPDataLineMessageHookHandler());
+defaultHandlers.add(new StartTlsCmdHandler());
return defaultHandlers;
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (PROTOCOLS-45) Add StartTLS support
Add StartTLS support Key: PROTOCOLS-45 URL: https://issues.apache.org/jira/browse/PROTOCOLS-45 Project: JAMES Protocols Issue Type: New Feature Components: lmtp Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta2 STARTTLS should be supported by LTMP -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-45) Add StartTLS support
[ https://issues.apache.org/jira/browse/PROTOCOLS-45?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-45. Resolution: Fixed Add StartTLS support Key: PROTOCOLS-45 URL: https://issues.apache.org/jira/browse/PROTOCOLS-45 Project: JAMES Protocols Issue Type: New Feature Components: lmtp Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta2 STARTTLS should be supported by LTMP -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189846 - in /james/protocols/trunk: lmtp/src/main/java/org/apache/james/protocols/lmtp/ smtp/src/main/java/org/apache/james/protocols/smtp/
Author: norman
Date: Thu Oct 27 16:29:10 2011
New Revision: 1189846
URL: http://svn.apache.org/viewvc?rev=1189846view=rev
Log:
Simplify starttls configuration
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java?rev=1189846r1=1189845r2=1189846view=diff
==
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
(original)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
Thu Oct 27 16:29:10 2011
@@ -22,14 +22,6 @@ import org.apache.james.protocols.smtp.S
public abstract class LMTPConfiguration implements SMTPConfiguration{
-
-
-@Override
-public int getResetLength() {
-return -1;
-}
-
-
@Override
public boolean isRelayingAllowed(String remoteIP) {
return false;
@@ -49,13 +41,4 @@ public abstract class LMTPConfiguration
public boolean useAddressBracketsEnforcement() {
return false;
}
-
-
-@Override
-public boolean isStartTLSSupported() {
-return false;
-}
-
-
-
}
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java?rev=1189846r1=1189845r2=1189846view=diff
==
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
(original)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
Thu Oct 27 16:29:10 2011
@@ -23,6 +23,7 @@ public class LMTPConfigurationImpl exten
private String helloName = localhost;
private long maxMessageSize = 0;
private String greeting = JAMES Protocols LMTP Server;
+ private boolean startTLSsupported = false;
@Override
public String getHelloName() {
@@ -52,4 +53,13 @@ public class LMTPConfigurationImpl exten
public void setGreeting(String greeting) {
this.greeting = greeting;
}
+
+@Override
+public boolean isStartTLSSupported() {
+return startTLSsupported;
+}
+
+public void setStartTLSSupported(boolean startTLSsupported) {
+this.startTLSsupported = startTLSsupported;
+}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java?rev=1189846r1=1189845r2=1189846view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java
Thu Oct 27 16:29:10 2011
@@ -37,14 +37,6 @@ public interface SMTPConfiguration {
String getHelloName();
/**
- * Returns the service wide reset length in bytes.
- *
- * @return the reset length
- */
-@Deprecated
-int getResetLength();
-
-/**
* Returns the service wide maximum message size in bytes.
*
* @return the maximum message size
@@ -92,7 +84,9 @@ public interface SMTPConfiguration {
boolean useAddressBracketsEnforcement();
/**
+ * Return codetrue/code if STARTTLS is supported.
*
+ * @return starttls
*/
boolean isStartTLSSupported();
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java?rev=1189846r1=1189845r2=1189846view=diff
==
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
Thu Oct 27 16:29:10 2011
@@ -28,15 +28,12 @@ public class SMTPConfigurationImpl imple
private boolean
svn commit: r1189850 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Thu Oct 27 16:33:16 2011 New Revision: 1189850 URL: http://svn.apache.org/viewvc?rev=1189850view=rev Log: Delete for re-roll Removed: james/protocols/tags/protocols-1.6-beta2/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189851 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Thu Oct 27 16:36:07 2011 New Revision: 1189851 URL: http://svn.apache.org/viewvc?rev=1189851view=rev Log: [maven-release-plugin] prepare release protocols-1.6-beta2 Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1189851r1=1189850r2=1189851view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Thu Oct 27 16:36:07 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189851r1=1189850r2=1189851view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Thu Oct 27 16:36:07 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189851r1=1189850r2=1189851view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Thu Oct 27 16:36:07 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189851r1=1189850r2=1189851view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 16:36:07 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version packagingpom/packaging nameApache James Protocols/name @@ -45,9 +45,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN/url + connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN/url /scm ciManagement systemhudson/system Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189851r1=1189850r2=1189851view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Thu Oct 27 16:36:07 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189854 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Thu Oct 27 16:36:49 2011 New Revision: 1189854 URL: http://svn.apache.org/viewvc?rev=1189854view=rev Log: [maven-release-plugin] copy for tag protocols-1.6-beta2 Added: james/protocols/tags/protocols-1.6-beta2/ - copied from r1189853, james/protocols/trunk/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189890 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Thu Oct 27 17:46:21 2011 New Revision: 1189890 URL: http://svn.apache.org/viewvc?rev=1189890view=rev Log: Re-roll Removed: james/protocols/tags/protocols-1.6-beta2/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189892 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Thu Oct 27 17:52:26 2011 New Revision: 1189892 URL: http://svn.apache.org/viewvc?rev=1189892view=rev Log: [maven-release-plugin] prepare release protocols-1.6-beta2 Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1189892r1=1189891r2=1189892view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Thu Oct 27 17:52:26 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189892r1=1189891r2=1189892view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Thu Oct 27 17:52:26 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189892r1=1189891r2=1189892view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Thu Oct 27 17:52:26 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189892r1=1189891r2=1189892view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 17:52:26 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version packagingpom/packaging nameApache James Protocols/name @@ -45,9 +45,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN/url + connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN/url /scm ciManagement systemhudson/system Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189892r1=1189891r2=1189892view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Thu Oct 27 17:52:26 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189894 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Thu Oct 27 17:53:25 2011 New Revision: 1189894 URL: http://svn.apache.org/viewvc?rev=1189894view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1189894r1=1189893r2=1189894view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Thu Oct 27 17:53:25 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189894r1=1189893r2=1189894view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Thu Oct 27 17:53:25 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189894r1=1189893r2=1189894view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Thu Oct 27 17:53:25 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189894r1=1189893r2=1189894view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 17:53:25 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version packagingpom/packaging nameApache James Protocols/name @@ -45,9 +45,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN/url + connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN/url /scm ciManagement systemhudson/system Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189894r1=1189893r2=1189894view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Thu Oct 27 17:53:25 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[VOTE] Apache James Protocols 1.6-beta2 (second take)
Hi there, after fixing some last minute bugs we are ready for re-roll Apache James Protocols 1.6-beta2. So please cast your VOTE. Artifacts: https://repository.apache.org/content/repositories/orgapachejames-107/ [ ] +1 Yes do it now! [ ] +0 No time to review [ ] -1 Something wrong with the artifacts Bye, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189988 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Thu Oct 27 20:16:47 2011 New Revision: 1189988 URL: http://svn.apache.org/viewvc?rev=1189988view=rev Log: re-roll for the last time Removed: james/protocols/tags/protocols-1.6-beta2/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189990 - /james/protocols/trunk/pom.xml
Author: norman
Date: Thu Oct 27 20:18:14 2011
New Revision: 1189990
URL: http://svn.apache.org/viewvc?rev=1189990view=rev
Log:
Fix jar generation for lmtp
Modified:
james/protocols/trunk/pom.xml
Modified: james/protocols/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189990r1=1189989r2=1189990view=diff
==
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Thu Oct 27 20:18:14 2011
@@ -74,6 +74,11 @@
dependencies
dependency
groupIdorg.apache.james.protocols/groupId
+artifactIdprotocols-lmtp/artifactId
+version${project.version}/version
+/dependency
+dependency
+groupIdorg.apache.james.protocols/groupId
artifactIdprotocols-smtp/artifactId
version${project.version}/version
/dependency
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189991 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Thu Oct 27 20:21:10 2011 New Revision: 1189991 URL: http://svn.apache.org/viewvc?rev=1189991view=rev Log: [maven-release-plugin] prepare release protocols-1.6-beta2 Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1189991r1=1189990r2=1189991view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Thu Oct 27 20:21:10 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189991r1=1189990r2=1189991view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Thu Oct 27 20:21:10 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189991r1=1189990r2=1189991view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Thu Oct 27 20:21:10 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189991r1=1189990r2=1189991view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 20:21:10 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version packagingpom/packaging nameApache James Protocols/name @@ -45,9 +45,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN/url + connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN/url /scm ciManagement systemhudson/system Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189991r1=1189990r2=1189991view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Thu Oct 27 20:21:10 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta3-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189994 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Thu Oct 27 20:21:39 2011 New Revision: 1189994 URL: http://svn.apache.org/viewvc?rev=1189994view=rev Log: [maven-release-plugin] copy for tag protocols-1.6-beta2 Added: james/protocols/tags/protocols-1.6-beta2/ - copied from r1189993, james/protocols/trunk/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189995 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Thu Oct 27 20:21:53 2011 New Revision: 1189995 URL: http://svn.apache.org/viewvc?rev=1189995view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1189995r1=1189994r2=1189995view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Thu Oct 27 20:21:53 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189995r1=1189994r2=1189995view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Thu Oct 27 20:21:53 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189995r1=1189994r2=1189995view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Thu Oct 27 20:21:53 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189995r1=1189994r2=1189995view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 20:21:53 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version packagingpom/packaging nameApache James Protocols/name @@ -45,9 +45,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN/url + connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN/url /scm ciManagement systemhudson/system Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189995r1=1189994r2=1189995view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Thu Oct 27 20:21:53 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: [VOTE] Apache James Protocols 1.6-beta2 (second take)
Sorry this is the correct url for the artifacts: https://repository.apache.org/content/repositories/orgapachejames-110/ Bye, Norman 2011/10/27 Norman Maurer norman.mau...@googlemail.com: Hi there, after fixing some last minute bugs we are ready for re-roll Apache James Protocols 1.6-beta2. So please cast your VOTE. Artifacts: https://repository.apache.org/content/repositories/orgapachejames-107/ [ ] +1 Yes do it now! [ ] +0 No time to review [ ] -1 Something wrong with the artifacts Bye, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[VOTE] Release Apache James Protocol 1.6-beta2
Hi there, I would like to release Apache James Protocols 1.6-beta2 as soon as possible ;) I fixed a few bugs which could lead to performance problems. So please review and cut your vote. Changes: https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=truejqlQuery=project+%3D+PROTOCOLS+AND+fixVersion+%3D+%221.6-beta2%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESCmode=hide Artifacts: https://repository.apache.org/content/repositories/orgapachejames-097/ [ ] +1 Yes please release [ ] +0 No time to review [ ] -1 Something wrong Thanks, Norman Ps: Release often, release early ;) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: James in Debian
I think I would go with jdeb for now. Bye, Norman 2011/10/25 Ioan Eugen Stan stan.ieu...@gmail.com: Hello, I was telling everybody some time ago that I wish to package James for Debian. Well, I did some research and found two possible solutions. They are named jdeb [1] and Maven helper[2]. I also included other people that showed interest in this matter. I welcome all input, so please don't hesitate if you have something to say. So, here is what I found: == jdeb == Is a Maven plugin so we will have to modify the poms and keep some Debian configuration file in our build tree. This is good, considering that we will be able to package software faster and be able to maintain the configuration. This is also bad because we will add complexity (extra task), plus requires some knowledge or support from a Debian Java team guy. It is relatively easy to use as you can see here [3], but it has another downside that will make packages created with it not included in Debian repo: it packages all declared dependencies in the deb archive. This creates slightly large packages. == Maven Helper == Is a Debian tool that relies on regular Debian tools to build debs. It will create good Debian packages but it has one requirement that is (for now) impossible to meet: it requires that all dependencies are already packaged into Debian (it builds offline). It also supports one major version per library ( e.g. only one of 1.x, 2.x, etc.) which for Java doesn't make much sense. It does make sense when you think about the size required to keep all library versions in the repo. Conclusions: James is a large project and has a lot of dependencies which I don't think are part of Debian. Striving to get all Apache software packaged for Debian is a sweet dream but requires a lot of man power and willingness and is not going to happen pretty soon. This is why I think we should start with jdeb and provide Debian packages this way. They will be bigger and each of them will provide all the dependencies but I think we can find a solution that works. They will not be able suitable for Debian inclusion but I think they will pave the way for it. I hope that by providing good Debian packages, we will be able to see more people adopting James. [1] https://github.com/tcurdt/jdeb [2] http://wiki.debian.org/Java/MavenDebianHelper [3] https://github.com/tcurdt/jdeb/blob/master/docs/maven.md -- Ioan Eugen Stan http://ieugen.blogspot.com/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188547 - /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
Author: norman
Date: Tue Oct 25 07:32:57 2011
New Revision: 1188547
URL: http://svn.apache.org/viewvc?rev=1188547view=rev
Log:
Use ConcurrentLinkedQueue for the Responses as this is faster and also prevent
deadlocks etc
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java?rev=1188547r1=1188546r2=1188547view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
Tue Oct 25 07:32:57 2011
@@ -21,8 +21,8 @@ package org.apache.james.protocols.api;
import java.io.InputStream;
import java.nio.charset.Charset;
-import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.james.protocols.api.FutureResponse.ResponseListener;
@@ -41,20 +41,17 @@ public abstract class AbstractProtocolTr
// TODO: Should we limit the size ?
-private final LinkedListResponse responses = new LinkedListResponse();
+private final ConcurrentLinkedQueueResponse responses = new
ConcurrentLinkedQueueResponse();
/**
* @see
org.apache.james.protocols.api.ProtocolTransport#writeResponse(org.apache.james.protocols.api.Response,
org.apache.james.protocols.api.ProtocolSession)
*/
public final void writeResponse(Response response, final ProtocolSession
session) {
-synchronized (responses) {
-// just add the response to the queue. We will trigger the write
operation later
-responses.add(response);
+// just add the response to the queue. We will trigger the write
operation later
+responses.add(response);
-// trigger the write
-writeQueuedResponses(session);
-}
-
+// trigger the write
+writeQueuedResponses(session);
}
/**
@@ -66,38 +63,37 @@ public abstract class AbstractProtocolTr
* @param session
*/
private void writeQueuedResponses(final ProtocolSession session) {
-synchronized (responses) {
-Response queuedResponse = null;
+Response queuedResponse = null;
-// dequeue Responses until non is left
-while ((queuedResponse = responses.poll()) != null) {
+// dequeue Responses until non is left
+while ((queuedResponse = responses.poll()) != null) {
-// check if we need to take special care of FutureResponses
-if (queuedResponse instanceof FutureResponse) {
-FutureResponse futureResponse =(FutureResponse)
queuedResponse;
-if (futureResponse.isReady()) {
-// future is ready so we can write it without blocking
the IO-Thread
-writeResponseToClient(queuedResponse, session);
-} else {
+// check if we need to take special care of FutureResponses
+if (queuedResponse instanceof FutureResponse) {
+FutureResponse futureResponse =(FutureResponse) queuedResponse;
+if (futureResponse.isReady()) {
+// future is ready so we can write it without blocking the
IO-Thread
+writeResponseToClient(queuedResponse, session);
+} else {
-// future is not ready so we need to write it via a
ResponseListener otherwise we MAY block the IO-Thread
-futureResponse.addListener(new ResponseListener() {
+// future is not ready so we need to write it via a
ResponseListener otherwise we MAY block the IO-Thread
+futureResponse.addListener(new ResponseListener() {
-public void onResponse(FutureResponse response) {
-writeResponseToClient(response, session);
-writeQueuedResponses(session);
-}
-});
+public void onResponse(FutureResponse response) {
+writeResponseToClient(response, session);
+writeQueuedResponses(session);
+}
+});
-// just break here as we will trigger the dequeue later
-break
[jira] [Created] (PROTOCOLS-43) Upgrade netty 3.2.6.Final
Upgrade netty 3.2.6.Final - Key: PROTOCOLS-43 URL: https://issues.apache.org/jira/browse/PROTOCOLS-43 Project: JAMES Protocols Issue Type: Task Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta2 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188715 - /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
Author: norman
Date: Tue Oct 25 15:32:42 2011
New Revision: 1188715
URL: http://svn.apache.org/viewvc?rev=1188715view=rev
Log:
Fix warning
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java?rev=1188715r1=1188714r2=1188715view=diff
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
Tue Oct 25 15:32:42 2011
@@ -136,7 +136,6 @@ public abstract class AbstractSession im
/**
* @see org.apache.james.protocols.api.ProtocolSession#getState()
*/
-@SuppressWarnings(unchecked)
public MapString, Object getState() {
return sessionState;
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188717 - /james/protocols/trunk/pom.xml
Author: norman Date: Tue Oct 25 15:33:41 2011 New Revision: 1188717 URL: http://svn.apache.org/viewvc?rev=1188717view=rev Log: Upgrade to netty 3.2.6.Final. See PROTOCOLS-43 Modified: james/protocols/trunk/pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188717r1=1188716r2=1188717view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Oct 25 15:33:41 2011 @@ -157,7 +157,7 @@ dependency groupIdorg.jboss.netty/groupId artifactIdnetty/artifactId -version3.2.4.Final/version +version3.2.6.Final/version /dependency dependency groupIdjunit/groupId - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-43) Upgrade netty 3.2.6.Final
[ https://issues.apache.org/jira/browse/PROTOCOLS-43?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-43. Resolution: Fixed Upgrade netty 3.2.6.Final - Key: PROTOCOLS-43 URL: https://issues.apache.org/jira/browse/PROTOCOLS-43 Project: JAMES Protocols Issue Type: Task Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta2 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188727 - in /james/protocols/trunk: lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Tue Oct 25 15:41:48 2011 New Revision: 1188727 URL: http://svn.apache.org/viewvc?rev=1188727view=rev Log: Use geronimo as a dependency for javamail instead of oracle javamail so that we don't need repositories entry in pom. See PROTOCOLS-40 Modified: james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188727r1=1188726r2=1188727view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Tue Oct 25 15:41:48 2011 @@ -53,8 +53,8 @@ artifactIdapache-mailet/artifactId /dependency dependency -groupIdjavax.mail/groupId -artifactIdmail/artifactId +groupIdorg.apache.geronimo.javamail/groupId +artifactIdgeronimo-javamail_1.4_mail/artifactId /dependency dependency Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188727r1=1188726r2=1188727view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Oct 25 15:41:48 2011 @@ -140,14 +140,14 @@ /exclusions /dependency dependency -groupIdjavax.mail/groupId -artifactIdmail/artifactId -version1.4.4/version +groupIdorg.apache.geronimo.specs/groupId +artifactIdgeronimo-activation_1.1_spec/artifactId +version1.0.2/version /dependency dependency -groupIdjavax.activation/groupId -artifactIdactivation/artifactId -version1.1.1/version +groupIdorg.apache.geronimo.javamail/groupId +artifactIdgeronimo-javamail_1.4_mail/artifactId +version1.6/version /dependency dependency groupIdcommons-codec/groupId @@ -168,16 +168,6 @@ /dependencies /dependencyManagement -repositories -!-- needed for javamail -- -repository -idmaven2-repository.dev.java.net/id -nameJava.net Repository for Maven/name -urlhttp://download.java.net/maven/2//url -layoutdefault/layout -/repository -/repositories - build pluginManagement plugins Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1188727r1=1188726r2=1188727view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Tue Oct 25 15:41:48 2011 @@ -57,10 +57,9 @@ artifactIdapache-mailet/artifactId /dependency dependency -groupIdjavax.mail/groupId -artifactIdmail/artifactId +groupIdorg.apache.geronimo.javamail/groupId +artifactIdgeronimo-javamail_1.4_mail/artifactId /dependency - dependency groupIdjunit/groupId artifactIdjunit/artifactId - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-40) Use geronimo as a dependency for javamail instead of oracle javamail so that we don't need repositories entry in pom.
[ https://issues.apache.org/jira/browse/PROTOCOLS-40?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-40. Resolution: Fixed Use geronimo as a dependency for javamail instead of oracle javamail so that we don't need repositories entry in pom. --- Key: PROTOCOLS-40 URL: https://issues.apache.org/jira/browse/PROTOCOLS-40 Project: JAMES Protocols Issue Type: Task Affects Versions: 1.5 Reporter: Stefano Bagnara Assignee: Norman Maurer Fix For: 1.6-beta2 This is a library project so we don't need to depend on an actual implementation (like we do, instead, in james server), but only on the api, and we can use api from geronimo. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188732 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Tue Oct 25 15:45:01 2011 New Revision: 1188732 URL: http://svn.apache.org/viewvc?rev=1188732view=rev Log: [maven-release-plugin] prepare release protocols-1.6-beta2 Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,16 +17,13 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,16 +17,13 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,16 +17,13 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,22 +17,19 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdjames-project/artifactId groupIdorg.apache.james/groupId version1.6/version -relativePath/relativePath +relativePath / /parent groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta2
svn commit: r1188733 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Tue Oct 25 15:45:11 2011 New Revision: 1188733 URL: http://svn.apache.org/viewvc?rev=1188733view=rev Log: [maven-release-plugin] copy for tag protocols-1.6-beta2 Added: james/protocols/tags/protocols-1.6-beta2/ - copied from r1188732, james/protocols/trunk/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188734 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Author: norman Date: Tue Oct 25 15:45:16 2011 New Revision: 1188734 URL: http://svn.apache.org/viewvc?rev=1188734view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1188734r1=1188733r2=1188734view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Tue Oct 25 15:45:16 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1188734r1=1188733r2=1188734view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Tue Oct 25 15:45:16 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188734r1=1188733r2=1188734view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Tue Oct 25 15:45:16 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188734r1=1188733r2=1188734view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Oct 25 15:45:16 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.james/groupId artifactIdprotocols/artifactId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version packagingpom/packaging nameApache James Protocols/name @@ -45,9 +45,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN/url + connectionscm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN/url /scm ciManagement systemhudson/system Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1188734r1=1188733r2=1188734view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Tue Oct 25 15:45:16 2011 @@ -23,7 +23,7 @@ parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2/version +version1.6-beta3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1342) Upgrade netty 3.2.6.Final
Upgrade netty 3.2.6.Final - Key: JAMES-1342 URL: https://issues.apache.org/jira/browse/JAMES-1342 Project: JAMES Server Issue Type: Task Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1188739 - /james/server/trunk/pom.xml
Author: norman Date: Tue Oct 25 15:49:05 2011 New Revision: 1188739 URL: http://svn.apache.org/viewvc?rev=1188739view=rev Log: Upgrade netty 3.2.6.Final. See JAMES-1342 Modified: james/server/trunk/pom.xml Modified: james/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1188739r1=1188738r2=1188739view=diff == --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Tue Oct 25 15:49:05 2011 @@ -992,7 +992,7 @@ dependency groupIdorg.jboss.netty/groupId artifactIdnetty/artifactId -version3.2.5.Final/version +version3.2.6.Final/version scopecompile/scope /dependency !-- This needed to let the bundle plugin to generate the right import statement -- - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-1342) Upgrade netty 3.2.6.Final
[ https://issues.apache.org/jira/browse/JAMES-1342?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JAMES-1342. -- Resolution: Fixed Upgrade netty 3.2.6.Final - Key: JAMES-1342 URL: https://issues.apache.org/jira/browse/JAMES-1342 Project: JAMES Server Issue Type: Task Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: svn commit: r1188732 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Hi there, when do you expect we are ready for 1.7 ? Bye, Norman -- Norman Maurer Gesendet mit Sparrow (http://www.sparrowmailapp.com/?sig) Am Dienstag, 25. Oktober 2011 um 17:55 schrieb Felix Knecht: Heads up Please be aware the both site.xml (src/site | src/reporting-site) still point to maven-skin-1.7-SNAPSHOT. Any try to build the site later after the release may fail because the skin dependency can't be found anymore. We need either to wait until TLP pom.xml is released or use the release skin dependency james-skin-1.7. This is also valid for other James projects then protocols Regards Felix On 10/25/2011 05:45 PM, nor...@apache.org (mailto:nor...@apache.org) wrote: Author: norman Date: Tue Oct 25 15:45:01 2011 New Revision: 1188732 URL: http://svn.apache.org/viewvc?rev=1188732view=rev Log: [maven-release-plugin] prepare release protocols-1.6-beta2 Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/impl/pom.xml james/protocols/trunk/lmtp/pom.xml james/protocols/trunk/pom.xml james/protocols/trunk/smtp/pom.xml Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,16 +17,13 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,16 +17,13 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,16 +17,13 @@ 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; +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; modelVersion4.0.0/modelVersion parent artifactIdprotocols/artifactId groupIdorg.apache.james/groupId -version1.6-beta2-SNAPSHOT/version +version1.6-beta2/version relativePath../pom.xml/relativePath /parent Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188732r1=1188731r2=1188732view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Oct 25 15:45:01 2011 @@ -17,22 +17,19 @@ specific language governing permissions and limitations under the License. -- -project - xmlns=http://maven.apache.org/POM/4.0.0
Re: svn commit: r1188732 - in /james/protocols/trunk: api/pom.xml impl/pom.xml lmtp/pom.xml pom.xml smtp/pom.xml
Yeah I would love to release protocols-1.6-beta2 asap ;) Thanks, Norman -- Norman Maurer Gesendet mit Sparrow (http://www.sparrowmailapp.com/?sig) Am Dienstag, 25. Oktober 2011 um 18:23 schrieb Felix Knecht: On 10/25/2011 06:06 PM, Norman Maurer wrote: Hi there, when do you expect we are ready for 1.7 ? Many things have been done, some others may still be discussed [1]. I tried to push for discussion before going to release it. But of course following release early release often we can also go for a release if you favourit. [1] http://www.mail-archive.com/server-dev@james.apache.org/msg36665.html Regards Felix Bye, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org (mailto:server-dev-unsubscr...@james.apache.org) For additional commands, e-mail: server-dev-h...@james.apache.org (mailto:server-dev-h...@james.apache.org)
Re: DOAP file
I think generating from maven makes sense. Bye Norman 2011/10/26, Felix Knecht fe...@otego.com: Hi IMO the DOAP file [1] isn't up to date, e.g. IMAP isn't mentioned at all in the description. Will the DOAP file be maintained manually in future or shall it be generated via maven-doap-plugin [2]? If the latter then we should add it to TLP pom before releasing. Thanks Felix [1] http://projects.apache.org/projects/james.html [2] http://maven.apache.org/plugins/maven-doap-plugin/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: svn commit: r1185997 - /james/project/trunk/pom.xml
We still have some project which are jdk 1.5... Do you plan to make
1.6 the default and override this on the others ?
Thanks,
Norman
2011/10/19 fel...@apache.org:
Author: felixk
Date: Wed Oct 19 07:01:27 2011
New Revision: 1185997
URL: http://svn.apache.org/viewvc?rev=1185997view=rev
Log:
- Target JDK is 1-6
- No need to generate test-javadocs for site generation, only javadocs are
needed to make them available from the site
Modified:
james/project/trunk/pom.xml
Modified: james/project/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/pom.xml?rev=1185997r1=1185996r2=1185997view=diff
==
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Wed Oct 19 07:01:27 2011
@@ -314,7 +314,7 @@
properties
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
- target.jdk1.5/target.jdk
+ target.jdk1.6/target.jdk
james-skin.version1.7/james-skin.version
maven-site-plugin.siteDirectory${basedir}/src/site/maven-site-plugin.siteDirectory
maven-site-plugin.generateReportsfalse/maven-site-plugin.generateReports
@@ -753,7 +753,6 @@
phasepre-site/phase
goals
goalaggregate/goal
- goaltest-aggregate/goal
/goals
configuration
minmemory256m/minmemory
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1340) ChannelImapResponseWriter should check if channel is connected before write to it
ChannelImapResponseWriter should check if channel is connected before write to it - Key: JAMES-1340 URL: https://issues.apache.org/jira/browse/JAMES-1340 Project: JAMES Server Issue Type: Improvement Components: IMAPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Priority: Minor Fix For: 3.0-beta4 At the moment we pass the object which should get written to the Channel.write(..) method and don't care if the channel is still connected. We should better first check if its connected as otherwise we will raise an exception later. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1186159 - /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
Author: norman
Date: Wed Oct 19 12:26:28 2011
New Revision: 1186159
URL: http://svn.apache.org/viewvc?rev=1186159view=rev
Log:
Check if the Channel is connected before write a message to it. See JAMES-1340
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java?rev=1186159r1=1186158r2=1186159view=diff
==
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
Wed Oct 19 12:26:28 2011
@@ -58,28 +58,34 @@ public class ChannelImapResponseWriter i
* @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
*/
public void write(byte[] buffer) throws IOException {
-channel.write(ChannelBuffers.wrappedBuffer(buffer));
+if (channel.isConnected()) {
+channel.write(ChannelBuffers.wrappedBuffer(buffer));
+}
}
/**
* @see
org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal)
*/
public void write(Literal literal) throws IOException {
-InputStream in = literal.getInputStream();
-if (in instanceof FileInputStream channel.getFactory() instanceof
NioServerSocketChannelFactory) {
-FileChannel fc = ((FileInputStream) in).getChannel();
-// Zero-copy is only possible if no SSL/TLS and no COMPRESS is in
place
-//
-// See JAMES-1305 and JAMES-1306
-ChannelPipeline cp = channel.getPipeline();
-if (zeroCopy cp.get(SslHandler.class) == null
cp.get(ZlibEncoder.class) == null ) {
-channel.write(new DefaultFileRegion(fc, fc.position(),
literal.size()));
+if (channel.isConnected()) {
+InputStream in = literal.getInputStream();
+if (in instanceof FileInputStream channel.getFactory()
instanceof NioServerSocketChannelFactory) {
+FileChannel fc = ((FileInputStream) in).getChannel();
+ // Zero-copy is only possible if no SSL/TLS and no
COMPRESS is in place
+//
+// See JAMES-1305 and JAMES-1306
+ChannelPipeline cp = channel.getPipeline();
+if (zeroCopy cp.get(SslHandler.class) == null
cp.get(ZlibEncoder.class) == null ) {
+channel.write(new DefaultFileRegion(fc, fc.position(),
literal.size()));
+} else {
+channel.write(new ChunkedNioFile(fc, 8192));
+}
} else {
-channel.write(new ChunkedNioFile(fc, 8192));
+channel.write(new ChunkedStream(literal.getInputStream()));
}
-} else {
-channel.write(new ChunkedStream(literal.getInputStream()));
}
}
+
+
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1341) ImapRequestFrameDecoder should only try to decode frame if ImapSession.getState() != ImapSessionState.LOGOUT
ImapRequestFrameDecoder should only try to decode frame if ImapSession.getState() != ImapSessionState.LOGOUT Key: JAMES-1341 URL: https://issues.apache.org/jira/browse/JAMES-1341 Project: JAMES Server Issue Type: Improvement Components: IMAPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1186171 - /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
Author: norman
Date: Wed Oct 19 12:36:46 2011
New Revision: 1186171
URL: http://svn.apache.org/viewvc?rev=1186171view=rev
Log:
ImapRequestFrameDecoder should only try to decode frame if
ImapSession.getState() != ImapSessionState.LOGOUT. See JAMES-1341
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java?rev=1186171r1=1186170r2=1186171view=diff
==
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
Wed Oct 19 12:36:46 2011
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.apache.james.imap.api.ImapMessage;
+import org.apache.james.imap.api.ImapSessionState;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.decode.ImapRequestLineReader;
@@ -160,7 +161,8 @@ public class ImapRequestFrameDecoder ext
ImapSession session = (ImapSession) attributes.get(channel);
// check if the session was removed before to prevent a harmless NPE.
See JAMES-1312
-if (session != null) {
+// Also check if the session was logged out if so there is not need to
try to decode it. See JAMES-1341
+if (session != null session.getState() != ImapSessionState.LOGOUT) {
try {
ImapMessage message = decoder.decode(reader, session);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-1341) ImapRequestFrameDecoder should only try to decode frame if ImapSession.getState() != ImapSessionState.LOGOUT
[ https://issues.apache.org/jira/browse/JAMES-1341?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JAMES-1341. -- Resolution: Fixed ImapRequestFrameDecoder should only try to decode frame if ImapSession.getState() != ImapSessionState.LOGOUT Key: JAMES-1341 URL: https://issues.apache.org/jira/browse/JAMES-1341 Project: JAMES Server Issue Type: Improvement Components: IMAPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: [VOTE] Release Apache James Skin 1.7
[x] +1 Please release Thanks for taking care :) Bye, Norman 2011/10/18 Felix Knecht fe...@otego.com: Hi A list of changes/fixes: - Logos for James modules added (when existing) - Fancybox utility for image zooms under MIT licence added - Access javascript arrays via array.item(nr) instead of array[nr] because the cgi script doesn't likes words in square brackets (JAMES-1260) - Implement Apache Branding Requirements 3. Website Navigation Links: navbar links included, link to www.apache.org included - need to update the left menu, putting the link to www.apache.org in bold (JAMES-1289) - Fix maven skin download tracking in order to support asynchronous google analytics code (the #googleAnalytics tag now includes the new code so that urchinTrack is not available anymore. - Rename artifact from maven-skin to james-skin (keep existing version) JAMES-1334) - Replace parent pom reference (JAMES-1334) - Cleanup pom and add needed definitions (JAMES-1334) - It's no longer a Maven2 but Maven3 skin (JAMES-1334) Please cast you vote for release Apache James Skin 1.7. Release for review: https://repository.apache.org/content/repositories/orgapachejames-073/ [ ] +1 Please release [ ] +0 No time to review [ ] -1 Something wrong which blocks the release. Thanks and regards Felix - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Fwd: [ANNOUNCEMENT] Hadoop 0.20.205.0 release
I guess this is the answer to our hbase problem bye norman -- Weitergeleitete Nachricht -- Von: Matt Foley Datum: Dienstag, 18. Oktober 2011 Betreff: [ANNOUNCEMENT] Hadoop 0.20.205.0 release An: gene...@hadoop.apache.org, common-u...@hadoop.apache.org, common-...@hadoop.apache.org On Friday 14 Oct, the Hadoop community voted ten to zero (including four PMC members voting in favor) to accept the release of Hadoop 0.20.205.0. The biggest feature of this release is that it merges the append/hsync/hflush features of branch-0.20-append, and security features of branch-0.20-security. Therefore, this is the first official Apache Hadoop release that supports HBase in secure mode! Thanks to everyone who contributed bug fixes, merges, and improvements. It was truly a community effort. Best regards, --Matt (Release Manager)
svn commit: r1185015 - /james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
Author: norman
Date: Mon Oct 17 06:10:10 2011
New Revision: 1185015
URL: http://svn.apache.org/viewvc?rev=1185015view=rev
Log:
LineHandlerUpstreamHandler does create byte arrays with wrong size when copy
data. See PROTOCOLS-42
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java?rev=1185015r1=1185014r2=1185015view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
Mon Oct 17 06:10:10 2011
@@ -48,10 +48,17 @@ public class LineHandlerUpstreamHandler
ChannelBuffer buf = (ChannelBuffer) e.getMessage();
byte[] line;
if (buf.hasArray()) {
-line = buf.array();
+if (buf.arrayOffset() == 0 buf.readableBytes() ==
buf.capacity()) {
+// we have no offset and the length is the same as the
capacity. Its safe to reuse the array without copy it first
+line = buf.array();
+} else {
+// copy the ChannelBuffer to a byte array to process the
LineHandler
+line = new byte[buf.readableBytes()];
+buf.getBytes(0, line);
+}
} else {
// copy the ChannelBuffer to a byte array to process the
LineHandler
-line = new byte[buf.capacity()];
+line = new byte[buf.readableBytes()];
buf.getBytes(0, line);
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (PROTOCOLS-42) LineHandlerUpstreamHandler does create byte arrays with wrong size when copy data
LineHandlerUpstreamHandler does create byte arrays with wrong size when copy data - Key: PROTOCOLS-42 URL: https://issues.apache.org/jira/browse/PROTOCOLS-42 Project: JAMES Protocols Issue Type: Bug Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Priority: Minor Fix For: 1.6-beta2 In the LineHandlerUpstreamHandler we create a new byte array which use ChannelBuffer.capacity() for the length of it. This is wrong, we should use ChannelBuffer.readableBytes(). Beside this we miss to respect the array offset if we try to optimize things and don't copy the byte array -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-42) LineHandlerUpstreamHandler does create byte arrays with wrong size when copy data
[ https://issues.apache.org/jira/browse/PROTOCOLS-42?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-42. Resolution: Fixed LineHandlerUpstreamHandler does create byte arrays with wrong size when copy data - Key: PROTOCOLS-42 URL: https://issues.apache.org/jira/browse/PROTOCOLS-42 Project: JAMES Protocols Issue Type: Bug Affects Versions: 1.6-beta1 Reporter: Norman Maurer Assignee: Norman Maurer Priority: Minor Fix For: 1.6-beta2 In the LineHandlerUpstreamHandler we create a new byte array which use ChannelBuffer.capacity() for the length of it. This is wrong, we should use ChannelBuffer.readableBytes(). Beside this we miss to respect the array offset if we try to optimize things and don't copy the byte array -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: James Server dies after few dayd
Hi, Unfortunaly I never used windows for a production setup. So I guess I can't help you much ... Bye Norman 2011/10/15, Saibabu Vallurupalli saibabu.vallurupa...@gmail.com: Hi Eric/Norman: Sorry the server we are using is Apache James 3.0 Beta 2. Do you have any known issues related to the issue we are getting. Let us know your thoughts. Thank you, Sai On Fri, Oct 14, 2011 at 1:19 PM, Saibabu Vallurupalli saibabu.vallurupa...@gmail.com wrote: Hi Team, We have recently upgraded our James server 3.1 beta2. Also, have got JPA encryption fix on top of 0.3 version. We are seening an issue with James windows setvice. It stops all of a sudden with no complaints in server.log files. Any ideas or suggestions to tackle this issue are greatly appreciated. Thank you, Sai - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Re: James Server dies after few dayd
Hi there, the problem is that I'm not a windows guy so I'm not sure how to debug there. In linux I would first run dmesg to see if maybe the jvm segfault. No idea if there is something similar in windows. The other thing you could check is if you got an OOM. Add this to the startup option of java: -XX:-HeapDumpOnOutOfMemoryError This will generate a heapdump if it exists because of an OOM. Bye, Norman 2011/10/15 Saibabu Vallurupalli saibabu.vallurupa...@gmail.com: Hi Norman, So, Is this something to do with OS? Any other ideas to debug the issues? Please advise us with some directions. Thank you, Sai On Sat, Oct 15, 2011 at 8:22 AM, Norman Maurer norman.mau...@googlemail.com wrote: Hi, Unfortunaly I never used windows for a production setup. So I guess I can't help you much ... Bye Norman 2011/10/15, Saibabu Vallurupalli saibabu.vallurupa...@gmail.com: Hi Eric/Norman: Sorry the server we are using is Apache James 3.0 Beta 2. Do you have any known issues related to the issue we are getting. Let us know your thoughts. Thank you, Sai On Fri, Oct 14, 2011 at 1:19 PM, Saibabu Vallurupalli saibabu.vallurupa...@gmail.com wrote: Hi Team, We have recently upgraded our James server 3.1 beta2. Also, have got JPA encryption fix on top of 0.3 version. We are seening an issue with James windows setvice. It stops all of a sudden with no complaints in server.log files. Any ideas or suggestions to tackle this issue are greatly appreciated. Thank you, Sai - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (IMAP-348) IdleProcessor does not remove HeartbeatHandler once IDLE was complete
IdleProcessor does not remove HeartbeatHandler once IDLE was complete --- Key: IMAP-348 URL: https://issues.apache.org/jira/browse/IMAP-348 Project: JAMES Imap Issue Type: Bug Components: Processor Affects Versions: 0.2.1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 0.3 When a client issue the IDLE command we add a HeartbeadHandler which sends a keep alive message every 2 minutes to make sure we don't run into timeouts while waiting for events. The problem is that we miss to remove the Handler once the client terminate IDLE by issue an DONE sequence. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (IMAP-348) IdleProcessor does not remove HeartbeatHandler once IDLE was complete
[ https://issues.apache.org/jira/browse/IMAP-348?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved IMAP-348. Resolution: Fixed IdleProcessor does not remove HeartbeatHandler once IDLE was complete --- Key: IMAP-348 URL: https://issues.apache.org/jira/browse/IMAP-348 Project: JAMES Imap Issue Type: Bug Components: Processor Affects Versions: 0.2.1 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 0.3 When a client issue the IDLE command we add a HeartbeadHandler which sends a keep alive message every 2 minutes to make sure we don't run into timeouts while waiting for events. The problem is that we miss to remove the Handler once the client terminate IDLE by issue an DONE sequence. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1183448 - /james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Author: norman
Date: Fri Oct 14 18:02:17 2011
New Revision: 1183448
URL: http://svn.apache.org/viewvc?rev=1183448view=rev
Log:
IdleProcessor does now remove HeartbeatHandler once IDLE was complete. See
IMAP-348
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java?rev=1183448r1=1183447r2=1183448view=diff
==
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Fri Oct 14 18:02:17 2011
@@ -28,6 +28,7 @@ import java.util.Locale;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapSessionState;
@@ -86,6 +87,8 @@ public class IdleProcessor extends Abstr
idleListener = null;
}
+final AtomicBoolean idleActive = new AtomicBoolean(true);
+
session.pushLineHandler(new ImapLineHandler() {
/**
@@ -118,6 +121,7 @@ public class IdleProcessor extends Abstr
okComplete(command, tag, responder);
}
+idleActive.set(false);
}
});
@@ -128,7 +132,7 @@ public class IdleProcessor extends Abstr
public void run() {
// check if we need to cancel the Runnable
// See IMAP-275
-if (session.getState() != ImapSessionState.LOGOUT) {
+if (session.getState() != ImapSessionState.LOGOUT
idleActive.get()) {
// Send a heartbeat to the client to make sure we
// reset the idle timeout. This is kind of the same
// workaround as dovecot use.
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1183454 - /james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
Author: norman
Date: Fri Oct 14 18:27:08 2011
New Revision: 1183454
URL: http://svn.apache.org/viewvc?rev=1183454view=rev
Log:
Start to implement remove method of FileMailQueue
Modified:
james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
Modified:
james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java?rev=1183454r1=1183453r2=1183454view=diff
==
---
james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
(original)
+++
james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
Fri Oct 14 18:27:08 2011
@@ -59,31 +59,30 @@ import org.slf4j.Logger;
*/
public class FileMailQueue implements ManageableMailQueue {
-private ConcurrentHashMapString, FileItem keyMappings = new
ConcurrentHashMapString, FileMailQueue.FileItem();
-private BlockingQueueString inmemoryQueue = new
LinkedBlockingQueueString();
-private ScheduledExecutorService scheduler =
Executors.newSingleThreadScheduledExecutor();
+private final ConcurrentHashMapString, FileItem keyMappings = new
ConcurrentHashMapString, FileMailQueue.FileItem();
+private final BlockingQueueString inmemoryQueue = new
LinkedBlockingQueueString();
+private final ScheduledExecutorService scheduler =
Executors.newSingleThreadScheduledExecutor();
private final static AtomicLong COUNTER = new AtomicLong();
-private final String queuename;
-private final File parentDir;
-private String queueDirName;
+private final String queueDirName;
+private final File queueDir;
private final Logger log;
-private boolean sync;
+
+private final boolean sync;
private final static String MSG_EXTENSION = .msg;
private final static String OBJECT_EXTENSION = .obj;
private final static String NEXT_DELIVERY = FileQueueNextDelivery;
private final static int SPLITCOUNT = 10;
public FileMailQueue(File parentDir, String queuename, boolean sync,
Logger log) throws IOException {
-this.queuename = queuename;
-this.parentDir = parentDir;
this.log = log;
this.sync = sync;
+this.queueDir = new File(parentDir, queuename);
+this.queueDirName = queueDir.getAbsolutePath();
+
init();
}
private void init() throws IOException {
-File queueDir = new File(parentDir, queuename);
-queueDirName = queueDir.getAbsolutePath();
for (int i = 1; i = SPLITCOUNT; i++) {
File qDir = new File(queueDir, Integer.toString(i));
@@ -272,10 +271,11 @@ public class FileMailQueue implements Ma
}
final String key = k;
+final FileItem fitem = item;
ObjectInputStream oin = null;
try {
-final File objectFile = new File(item.getObjectFile());
-final File msgFile = new File(item.getMessageFile());
+final File objectFile = new File(fitem.getObjectFile());
+final File msgFile = new File(fitem.getMessageFile());
oin = new ObjectInputStream(new FileInputStream(objectFile));
final Mail mail = (Mail) oin.readObject();
mail.setMessage(new MimeMessageCopyOnWriteProxy(new
FileMimeMessageSource(msgFile)));
@@ -296,16 +296,7 @@ public class FileMailQueue implements Ma
throw new MailQueueException(Unable to
rollback, e);
}
} else {
-keyMappings.remove(key);
-if (!objectFile.delete()) {
-if (log.isInfoEnabled()) {
-log.info(Unable to delete file +
objectFile);
-}
-}
-if (!msgFile.delete()) {
-if (log.isInfoEnabled()) {
-log.info(Unable to delete file +
msgFile);
-}}
+fitem.delete();
}
LifecycleUtil.dispose(mail);
@@ -388,7 +379,7 @@ public class FileMailQueue implements Ma
*
*
*/
-private final static class FileItem {
+private final class FileItem {
private String objectfile;
private String messagefile;
@@ -406,6 +397,23 @@ public class FileMailQueue implements Ma
return messagefile;
}
+public void delete() throws MailQueueException {
+File msgFile = new File(getMessageFile());
+File
svn commit: r1182677 - /james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Author: norman
Date: Thu Oct 13 06:16:56 2011
New Revision: 1182677
URL: http://svn.apache.org/viewvc?rev=1182677view=rev
Log:
Set the maxExecutionHandler to 16. See JAMES-1333
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1182677r1=1182676r2=1182677view=diff
==
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Thu Oct 13 06:16:56 2011
@@ -58,10 +58,10 @@ import org.slf4j.Logger;
*/
public abstract class AbstractConfigurableAsyncServer extends
AbstractAsyncServer implements LogEnabled, Configurable, ServerMBean {
/** The default value for the connection backlog. */
-private static final int DEFAULT_BACKLOG = 200;
+public static final int DEFAULT_BACKLOG = 200;
/** The default value for the connection timeout. */
-private static final int DEFAULT_TIMEOUT = 5 * 60;
+public static final int DEFAULT_TIMEOUT = 5 * 60;
/** The name of the parameter defining the connection timeout. */
private static final String TIMEOUT_NAME = connectiontimeout;
@@ -72,6 +72,8 @@ public abstract class AbstractConfigurab
/** The name of the parameter defining the service hello name. */
public static final String HELLO_NAME = helloName;
+public static final int DEFAULT_MAX_EXECUTOR_COUNT = 16;
+
// By default, use the Sun X509 algorithm that comes with the Sun JCE
// provider for SSL
// certificates
@@ -114,6 +116,7 @@ public abstract class AbstractConfigurab
private MBeanServer mbeanServer;
+
@Resource(name = filesystem)
public final void setFileSystem(FileSystem filesystem) {
this.fileSystem = filesystem;
@@ -193,7 +196,7 @@ public abstract class AbstractConfigurab
int ioWorker = config.getInt(ioWorkerCount, DEFAULT_IO_WORKER_COUNT);
setIoWorkerCount(ioWorker);
-maxExecutorThreads = config.getInt(maxExecutorCount, 50);
+maxExecutorThreads = config.getInt(maxExecutorCount,
DEFAULT_MAX_EXECUTOR_COUNT);
configureHelloName(config);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-1333) Minimize ExecutionHandler default size
[ https://issues.apache.org/jira/browse/JAMES-1333?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JAMES-1333. -- Resolution: Fixed Minimize ExecutionHandler default size -- Key: JAMES-1333 URL: https://issues.apache.org/jira/browse/JAMES-1333 Project: JAMES Server Issue Type: Task Components: IMAPServer, POP3Server, SMTPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 At the moment we use 50 which is quite to high for most enviroments. Better would be to set it to somthing like 16. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1333) Minimize ExecutionHandler default size
Minimize ExecutionHandler default size -- Key: JAMES-1333 URL: https://issues.apache.org/jira/browse/JAMES-1333 Project: JAMES Server Issue Type: Task Components: IMAPServer, POP3Server, SMTPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 At the moment we use 50 which is quite to high for most enviroments. Better would be to set it to somthing like 16. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[RESULT] [VOTE] Release Apache James Mime4j 0.7.1
Hi, the vote passed with: +1 Manuel, Eric, Robert, Norman +0 Ioan Thanks for everyone who voted. I will push the release to maven central and the apache mirrors later today. Bye, Norman 2011/10/8 Norman Maurer norman.mau...@googlemail.com: Hi there, its time for first patch release of the 0.7 series. Please cast you vote for release Apache James Mime4j 0.7.1. A list of fixes are here: https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=truejqlQuery=project+%3D+MIME4J+AND+fixVersion+%3D+%220.7.1%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESCmode=hide Release for review: https://repository.apache.org/content/repositories/orgapachejames-045/ [ ] +1 Please release [ ] +0 No time to review [ ] -1 Something wrong which blocks the release. Thanks, Norman - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1182416 - /james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/
Author: norman
Date: Wed Oct 12 15:03:52 2011
New Revision: 1182416
URL: http://svn.apache.org/viewvc?rev=1182416view=rev
Log:
Expose stats for the ExecutionHandler ThreadPool via JMX. See JMAES-1331
Added:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
(with props)
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutorMBean.java
(with props)
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1182416r1=1182415r2=1182416view=diff
==
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Wed Oct 12 15:03:52 2011
@@ -51,7 +51,6 @@ import org.jboss.netty.channel.ChannelPi
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
import org.slf4j.Logger;
/**
@@ -114,6 +113,7 @@ public abstract class AbstractConfigurab
private MBeanServer mbeanServer;
+
@Resource(name = filesystem)
public final void setFileSystem(FileSystem filesystem) {
this.fileSystem = filesystem;
@@ -473,14 +473,18 @@ public abstract class AbstractConfigurab
return connectionLimit;
}
+protected String getThreadPoolJMXPath() {
+return org.apache.james:type=server,name= + jmxName +
,sub-type=threadpool;
+}
+
@Override
protected Executor createBossExecutor() {
-return
JMXEnabledThreadPoolExecutor.newCachedThreadPool(org.apache.james:type=server,name=
+ jmxName + ,sub-type=threadpool, boss);
+return
JMXEnabledThreadPoolExecutor.newCachedThreadPool(getThreadPoolJMXPath(),
boss);
}
@Override
protected Executor createWorkerExecutor() {
-return
JMXEnabledThreadPoolExecutor.newCachedThreadPool(org.apache.james:type=server,name=
+ jmxName + ,sub-type=threadpool, worker);
+return
JMXEnabledThreadPoolExecutor.newCachedThreadPool(getThreadPoolJMXPath(),
worker);
}
/**
@@ -570,7 +574,7 @@ public abstract class AbstractConfigurab
* @return ehandler
*/
protected ExecutionHandler createExecutionHander() {
-return new ExecutionHandler(new
OrderedMemoryAwareThreadPoolExecutor(maxExecutorThreads, 0, 0));
+return new ExecutionHandler(new
JMXEnabledOrderedMemoryAwareThreadPoolExecutor(maxExecutorThreads, 0, 0,
getThreadPoolJMXPath(), executor));
}
/**
Added:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java?rev=1182416view=auto
==
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
(added)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
Wed Oct 12 15:03:52 2011
@@ -0,0 +1,163 @@
+/
+ * 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
[jira] [Resolved] (JAMES-1331) Expose stats for the ExecutionHandler ThreadPool via JMX
[ https://issues.apache.org/jira/browse/JAMES-1331?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JAMES-1331. -- Resolution: Fixed done Expose stats for the ExecutionHandler ThreadPool via JMX Key: JAMES-1331 URL: https://issues.apache.org/jira/browse/JAMES-1331 Project: JAMES Server Issue Type: Improvement Components: IMAPServer, POP3Server, SMTPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 As we use an ExecutionHandler to hand of blocking task to another threadpool it would be nice to expose some jmx stats fo it. This allows for better monitoring -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1331) Expose stats for the ExecutionHandler ThreadPool via JMX
Expose stats for the ExecutionHandler ThreadPool via JMX Key: JAMES-1331 URL: https://issues.apache.org/jira/browse/JAMES-1331 Project: JAMES Server Issue Type: Improvement Components: IMAPServer, POP3Server, SMTPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 As we use an ExecutionHandler to hand of blocking task to another threadpool it would be nice to expose some jmx stats fo it. This allows for better monitoring -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1182417 - /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
Author: norman
Date: Wed Oct 12 15:08:23 2011
New Revision: 1182417
URL: http://svn.apache.org/viewvc?rev=1182417view=rev
Log:
Reset idle-timeout one IDLE heartbeats. See JAMES-1332
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?rev=1182417r1=1182416r2=1182417view=diff
==
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
Wed Oct 12 15:08:23 2011
@@ -130,7 +130,7 @@ public class IMAPServer extends Abstract
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = pipeline();
pipeline.addLast(GROUP_HANDLER, groupHandler);
-pipeline.addLast(idleHandler, new IdleStateHandler(timer, 0,
30, TIMEOUT, TIMEOUT_UNIT));
+pipeline.addLast(idleHandler, new IdleStateHandler(timer, 0,
0, TIMEOUT, TIMEOUT_UNIT));
pipeline.addLast(TIMEOUT_HANDLER, new ImapIdleStateHandler());
pipeline.addLast(CONNECTION_LIMIT_HANDLER, new
ConnectionLimitUpstreamHandler(IMAPServer.this.connectionLimit));
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1332) IMAPServer does not reset idle-timeout one IDLE heartbeats
IMAPServer does not reset idle-timeout one IDLE heartbeats -- Key: JAMES-1332 URL: https://issues.apache.org/jira/browse/JAMES-1332 Project: JAMES Server Issue Type: Bug Components: IMAPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 While IDLE is active we send heartbeats to make sure the connection is not timed-out. Unfortunally we miss to reset the idle timeout once such a heartbeat is send. This needs to get fixed -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-1332) IMAPServer does not reset idle-timeout one IDLE heartbeats
[ https://issues.apache.org/jira/browse/JAMES-1332?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JAMES-1332. -- Resolution: Fixed IMAPServer does not reset idle-timeout one IDLE heartbeats -- Key: JAMES-1332 URL: https://issues.apache.org/jira/browse/JAMES-1332 Project: JAMES Server Issue Type: Bug Components: IMAPServer Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 While IDLE is active we send heartbeats to make sure the connection is not timed-out. Unfortunally we miss to reset the idle timeout once such a heartbeat is send. This needs to get fixed -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-1330) MimeMessageInputStreamSource should keep bytes in memory till a threshould is exceed
MimeMessageInputStreamSource should keep bytes in memory till a threshould is exceed Key: JAMES-1330 URL: https://issues.apache.org/jira/browse/JAMES-1330 Project: JAMES Server Issue Type: Improvement Components: James Core Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 At the moment we store the content of the MimeMessageInputStreamSource in a temporary file even if its only a few bytes. This is used for temporary store the message content till the SMTP Client does end the DATA sequence with a CRLF.CRLF. This slow down things as we need to write to disk for every line we receive. It would be better to keep things in memory till a threshould is hit. I think 100kb is a good one as it should be enought for 90 % of emails and the other 10 % can just get temporary stored on disk -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1181908 - /james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
Author: norman
Date: Tue Oct 11 17:39:32 2011
New Revision: 1181908
URL: http://svn.apache.org/viewvc?rev=1181908view=rev
Log:
MimeMessageInputStreamSource should keep bytes in memory till a threshould is
exceed. See JAMES-1330
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java?rev=1181908r1=1181907r2=1181908view=diff
==
---
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
(original)
+++
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
Tue Oct 11 17:39:32 2011
@@ -20,16 +20,16 @@
package org.apache.james.core;
import javax.mail.MessagingException;
+import javax.mail.util.SharedByteArrayInputStream;
import javax.mail.util.SharedFileInputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.DeferredFileOutputStream;
import org.apache.james.lifecycle.api.Disposable;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -39,21 +39,17 @@ import java.util.List;
/**
* Takes an input stream and creates a repeatable input stream source for a
* MimeMessageWrapper. It does this by completely reading the input stream and
- * saving that to a temporary file that should delete on exit, or when this
- * object is GC'd.
+ * saving that to data to an {@link DeferredFileOutputStream} with its
threshold set to 100kb
*
- * @see MimeMessageWrapper
- */
+ **/
public class MimeMessageInputStreamSource extends MimeMessageSource implements
Disposable {
private final ListInputStream streams = new ArrayListInputStream();
-private OutputStream out;
-
/**
* A temporary file used to hold the message stream
*/
-private File file;
+private DeferredFileOutputStream out;
/**
* The full path of the temporary file
@@ -61,6 +57,16 @@ public class MimeMessageInputStreamSourc
private String sourceId;
/**
+ * 100kb threshold for the stream.
+ */
+private final static int THRESHOLD = 1024 * 100;
+
+/**
+ * Temporary directory to use
+ */
+private final static File TMPDIR = new
File(System.getProperty(java.io.tmpdir));
+
+/**
* Construct a new MimeMessageInputStreamSource from an
* codeInputStream/code that contains the bytes of a MimeMessage.
*
@@ -76,18 +82,21 @@ public class MimeMessageInputStreamSourc
super();
// We want to immediately read this into a temporary file
// Create a temp file and channel the input stream into it
-OutputStream fout = null;
try {
-file = File.createTempFile(key, .m64);
-fout = new BufferedOutputStream(new FileOutputStream(file));
-IOUtils.copy(in, fout);
-sourceId = file.getCanonicalPath();
+out = new DeferredFileOutputStream(THRESHOLD, key, .m64, TMPDIR
);
+IOUtils.copy(in, out);
+sourceId = key;
} catch (IOException ioe) {
throw new MessagingException(Unable to retrieve the data: +
ioe.getMessage(), ioe);
} finally {
try {
-if (fout != null) {
-fout.close();
+if (out != null) {
+out.close();
+
+File file = out.getFile();
+if (file != null) {
+file.delete();
+}
}
} catch (IOException ioe) {
// Ignored - logging unavailable to log this non-fatal error.
@@ -100,31 +109,14 @@ public class MimeMessageInputStreamSourc
} catch (IOException ioe) {
// Ignored - logging unavailable to log this non-fatal error.
}
-
-// if sourceId is null while file is not null then we had
-// an IOxception and we have to clean the file.
-if (sourceId == null file != null) {
-// No need to throw an IOException when unable to delete as
it's a temporary file
-file.delete();
-}
+
}
}
public MimeMessageInputStreamSource(String key) throws MessagingException {
super();
-try {
-file = File.createTempFile(key, .m64);
-sourceId = file.getCanonicalPath();
-} catch (IOException e) {
-throw new
[jira] [Resolved] (JAMES-1330) MimeMessageInputStreamSource should keep bytes in memory till a threshould is exceed
[ https://issues.apache.org/jira/browse/JAMES-1330?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved JAMES-1330. -- Resolution: Fixed MimeMessageInputStreamSource should keep bytes in memory till a threshould is exceed Key: JAMES-1330 URL: https://issues.apache.org/jira/browse/JAMES-1330 Project: JAMES Server Issue Type: Improvement Components: James Core Affects Versions: 3.0-beta3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 3.0-beta4 At the moment we store the content of the MimeMessageInputStreamSource in a temporary file even if its only a few bytes. This is used for temporary store the message content till the SMTP Client does end the DATA sequence with a CRLF.CRLF. This slow down things as we need to write to disk for every line we receive. It would be better to keep things in memory till a threshould is hit. I think 100kb is a good one as it should be enought for 90 % of emails and the other 10 % can just get temporary stored on disk -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (MAILBOX-151) AbstractDelegatingMailboxListeners should release locks faster
[ https://issues.apache.org/jira/browse/MAILBOX-151?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved MAILBOX-151. --- Resolution: Fixed AbstractDelegatingMailboxListeners should release locks faster -- Key: MAILBOX-151 URL: https://issues.apache.org/jira/browse/MAILBOX-151 Project: James Mailbox Issue Type: Improvement Components: store Affects Versions: 0.3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 0.4 In AbstractDelegatingMailboxListeners.event(...) we do a very bad job in releasing the locks in a timely manner, as we execute the whole MailboxListener.event(...) calls in the synchronized block. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
