[jira] [Resolved] (PROTOCOLS-51) Make configuration of STARTLS more consistent
[ https://issues.apache.org/jira/browse/PROTOCOLS-51?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-51. Resolution: Fixed > Make configuration of STARTLS more consistent > - > > Key: PROTOCOLS-51 > URL: https://issues.apache.org/jira/browse/PROTOCOLS-51 > Project: JAMES Protocols > Issue Type: Improvement > Components: api, lmtp, pop3, smtp >Affects Versions: 1.6-beta2 >Reporter: Norman Maurer >Assignee: Norman Maurer > Fix For: 1.6-beta3 > > > At the moment its really "clumpy" to configure STARTTLS, thats because you > need to set it in many places. We should simplify this -- 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] (PROTOCOLS-51) Make configuration of STARTLS more consistent
Make configuration of STARTLS more consistent - Key: PROTOCOLS-51 URL: https://issues.apache.org/jira/browse/PROTOCOLS-51 Project: JAMES Protocols Issue Type: Improvement Components: api, lmtp, pop3, smtp Affects Versions: 1.6-beta2 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta3 At the moment its really "clumpy" to configure STARTTLS, thats because you need to set it in many places. We should simplify this -- 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: r1204047 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ impl/src/main/java/org/apache/james/protocols/impl/ lmtp/src/main/java/org/apache/james/protocols/lm
Author: norman
Date: Sat Nov 19 19:28:41 2011
New Revision: 1204047
URL: http://svn.apache.org/viewvc?rev=1204047&view=rev
Log:
Make configuration of STARTLS more consistent. See PROTOCOLS-51
Added:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
(with props)
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/Secure.java
(with props)
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
james/protocols/trunk/pop3/.classpath
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3HandlerConfiguration.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.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
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
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
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=1204047&r1=1204046&r2=1204047&view=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
Sat Nov 19 19:28:41 2011
@@ -40,12 +40,5 @@ public interface Protocol {
* @return session
*/
ProtocolSession newSession(ProtocolTransport transport);
-
-/**
- * Returns true if STARTTLS is supported
- *
- * @return starttlsSupported
- */
-boolean isStartTLSSupported();
}
Added:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java?rev=1204047&view=auto
==
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
(added)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
Sat Nov 19 19:28:41 2011
@@ -0,0 +1,25 @@
+package org.apache.james.protocols.api;
+
+import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProtocolImpl implements Protocol{
+protected final Logger logger = LoggerFactory.getLogger(getClass());
+private ProtocolHandlerChain chain;
+
+public ProtocolImpl(ProtocolHandlerChain chain) {
+this.chain = chain;
+}
+
+@Override
+public ProtocolHandlerChain getProtocolChain() {
+return chain;
+}
+
+@Override
+public ProtocolSession newSession(ProtocolTransport transport) {
+return new ProtocolSessionImpl(logger, transport);
+}
+
+}
Propchange:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
--
svn:mime-type = text/plain
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java?rev=1204047&r1=1204046&r2=1204047&view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
Sat Nov 19 19:28:41 2011
@@ -35,25 +35,25 @@ import org.slf4j.LoggerFactory;
*/
public class NettyServer extends AbstractAsyncServer {
-protected Protocol protocol;
+protected final Protocol protocol;
-protected Logger logger = LoggerFactory.getLogger(NettyServer.class);
-
-protected SSLContext context;
+protected final Logger logger = LoggerFactory.getLogger(NettyServer.class);
private ExecutionHandler eHandler;
private ChannelUpstreamHandler coreHandler;
+protected final Secure secure;
+
public NettyServer(Protocol protocol
svn commit: r1204033 - /james/imap/trunk/pom.xml
Author: norman Date: Sat Nov 19 18:11:45 2011 New Revision: 1204033 URL: http://svn.apache.org/viewvc?rev=1204033&view=rev Log: Move to james-project 1.8-SNAPSHOT Modified: james/imap/trunk/pom.xml Modified: james/imap/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/imap/trunk/pom.xml?rev=1204033&r1=1204032&r2=1204033&view=diff == --- james/imap/trunk/pom.xml (original) +++ james/imap/trunk/pom.xml Sat Nov 19 18:11:45 2011 @@ -26,7 +26,7 @@ james-project org.apache.james -1.7 +1.8-SNAPSHOT @@ -287,19 +287,6 @@ - -org.codehaus.mojo -emma-maven-plugin -true - - -process-classes - -instrument - - - - org.apache.maven.plugins maven-assembly-plugin @@ -311,11 +298,6 @@ -org.apache.maven.plugins -maven-surefire-plugin -true - - org.apache.felix maven-bundle-plugin - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1204032 - /james/mailbox/trunk/pom.xml
Author: norman Date: Sat Nov 19 18:09:59 2011 New Revision: 1204032 URL: http://svn.apache.org/viewvc?rev=1204032&view=rev Log: Move to james-project 1.8-SNAPSHOT Modified: james/mailbox/trunk/pom.xml Modified: james/mailbox/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1204032&r1=1204031&r2=1204032&view=diff == --- james/mailbox/trunk/pom.xml (original) +++ james/mailbox/trunk/pom.xml Sat Nov 19 18:09:59 2011 @@ -26,7 +26,7 @@ james-project org.apache.james -1.7 +1.8-SNAPSHOT @@ -563,19 +563,7 @@ - -org.codehaus.mojo -emma-maven-plugin -true - - -process-classes - -instrument - - - - + - 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 : > 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: Forking tests
Release often release often 2011/11/18, Felix Knecht : > 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 Knecht: >>> 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 Knecht 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: 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 : > 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 Knecht 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 > >
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=1203768&view=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=1203768&r1=1203767&r2=1203768&view=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
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=1203767&view=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=1203767&r1=1203766&r2=1203767&view=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(LineHandler
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=1203767&r1=1203766&r2=1203767&view=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/protoc
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=1203764&view=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=1203764&r1=1203763&r2=1203764&view=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 List getHandlers();
-
+/**
+ * Return an immutable List of all Handlers
+ *
+ * @return handlerList
+ */
+protected abstract List 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=1203764&r1=1203763&r2=1203764&view=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 LinkedList getHandlers(Class type);
+ LinkedList getHandlers(Class 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=1203764&r1=1203763&r2=1203764&view=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 List{
+public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain
implements List {
+
+private final List handlers = new
ArrayList();
+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 List getHandlers() {
+return Collections.unmodifiableList(handlers);
+}
+
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=1203758&view=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=1203758&r1=1203757&r2=1203758&view=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 List initDefaultHandlers() {
List defaultHandlers = new
ArrayList();
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
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=1203750&view=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=1203750&r1=1203749&r2=1203750&view=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 true 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=1203750&r1=1203749&r2=1203750&view=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=1203750&r1=1203749&r2=1203750&view=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=1203750&r1=1203749&r2=1203750&view=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 List getHandlers();
+ protected abstract List getHandlers();
/**
* @see
org.apache.james.protocols.api.handler.ProtocolHandlerChain#getHandlers(java
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=1203685&view=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=1203685&r1=1203684&r2=1203685&view=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 CommandHandler,
ExtensibleHandler {
+ private static final Collection COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("DATA"));
+
public static final class DataConsumerLineHandler implements
LineHandler {
/**
@@ -128,10 +132,7 @@ public class DataCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection getImplCommands() {
-Collection implCommands = new ArrayList();
-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=1203685&r1=1203684&r2=1203685&view=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 Collection COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("EXPN"));
/**
* Handler method called upon recei
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=1203675&view=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=1203675&r1=1203674&r2=1203675&view=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
ArrayList((Collection)session.getState().get(SMTPSession.RCPT_LIST)));
+MailEnvelope env = createEnvelope(session, (MailAddress)
session.getState().get(SMTPSession.SENDER), new
ArrayList((Collection)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=1203675&r1=1203674&r2=1203675&view=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=1203675&r1=1203674&r2=1203675&view=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,
LineHandler next) {
+@SuppressWarnings("unchecked")
+ private Response addNewReceivedMailHeaders(SMTPSession session,
LineHandler next) {
StringBuilder headerLineBuffer = new StringBuilder();
String heloMode = (String) session.
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=1203668&view=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=1203668&r1=1203667&r2=1203668&view=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 Map connectionState;
private final Map 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 HashMap();
this.sessionState = new HashMap();
@@ -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: r1203665 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ impl/src/main/java/org/apache/james/protocols/impl/ pop3/src/main/java/org/apache/james/protocols/po
Author: norman
Date: Fri Nov 18 14:29:13 2011
New Revision: 1203665
URL: http://svn.apache.org/viewvc?rev=1203665&view=rev
Log:
Rename AbstractSession to ProtocolSessionImpl and make it non-abstract.
Added:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
- copied, changed from r1203663,
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
Removed:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
Copied:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
(from r1203663,
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/ProtocolSessionImpl.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java&r1=1203663&r2=1203665&rev=1203665&view=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/ProtocolSessionImpl.java
Fri Nov 18 14:29:13 2011
@@ -28,11 +28,11 @@ import org.apache.james.protocols.api.Pr
import org.slf4j.Logger;
/**
- * Abstract implementation of {@link ProtocolSession}
+ * Basic implementation of {@link ProtocolSession}
*
*
*/
-public abstract class AbstractSession implements ProtocolSession {
+public class ProtocolSessionImpl implements ProtocolSession {
private final InetSocketAddress remoteAddress;
private Logger logger;
@@ -48,7 +48,7 @@ public abstract class AbstractSession im
private final InetSocketAddress localAddress;
-public AbstractSession(Logger logger, ProtocolTransport transport) {
+public ProtocolSessionImpl(Logger logger, ProtocolTransport transport) {
this.transport = transport;
this.remoteAddress = transport.getRemoteAddress();
this.localAddress = transport.getRemoteAddress();
@@ -152,4 +152,28 @@ public abstract class AbstractSession im
return sessionState;
}
+/**
+ * This implementation just returns null. Sub-classes should
overwrite this if needed
+ */
+ @Override
+ public Response newLineTooLongResponse() {
+ return null;
+ }
+
+/**
+ * This implementation just returns null. Sub-classes should
overwrite this if needed
+ */
+ @Override
+ public Response newFatalErrorResponse() {
+ return null;
+ }
+
+ /**
+* This implementation just clears the sessions state. Sub-classes
should overwrite this if needed
+*/
+ @Override
+ public void resetState() {
+ sessionState.clear();
+ }
+
}
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java?rev=1203665&r1=1203664&r2=1203665&view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
Fri Nov 18 14:29:13 2011
@@ -24,7 +24,7 @@ import java.util.List;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
-import org.apache.james.protocols.api.AbstractSession;
+import org.apache.james.protocols.api.ProtocolSessionImpl;
import org.apache.james.protocols.api.FutureResponse;
import org.apache.james.protocols.api.Protocol;
import org.apache.james.protocols.api.ProtocolSession;
@@ -108,7 +108,7 @@ public class BasicChannelUpstreamHandler
}
if (response != null) {
// TODO: This kind of sucks but I was able to come up with
something more elegant here
-
((AbstractSession)session).getProtocolTransport().writeResponse(response,
session);
+
((ProtocolSessionImpl)session).getProtocolTranspor
svn commit: r1203663 - in /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api: AbstractSession.java ProtocolSession.java ProtocolTransport.java
Author: norman
Date: Fri Nov 18 14:25:15 2011
New Revision: 1203663
URL: http://svn.apache.org/viewvc?rev=1203663&view=rev
Log:
Allow to also access the local bound address. See PROTOCOLS-50
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.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
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=1203663&r1=1203662&r2=1203663&view=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
Fri Nov 18 14:25:15 2011
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
*/
public abstract class AbstractSession implements ProtocolSession {
-protected InetSocketAddress socketAddress;
+private final InetSocketAddress remoteAddress;
private Logger logger;
private SessionLog pLog = null;
@@ -43,13 +43,15 @@ public abstract class AbstractSession im
private String id;
protected ProtocolTransport transport;
-private Map connectionState;
-private Map sessionState;
+private final Map connectionState;
+private final Map sessionState;
+ private final InetSocketAddress localAddress;
public AbstractSession(Logger logger, ProtocolTransport transport) {
this.transport = transport;
-this.socketAddress = transport.getRemoteAddress();
+this.remoteAddress = transport.getRemoteAddress();
+this.localAddress = transport.getRemoteAddress();
this.logger = logger;
this.id = transport.getId();
this.connectionState = new HashMap();
@@ -57,18 +59,28 @@ public abstract class AbstractSession im
}
-/**
+@Override
+ public InetSocketAddress getLocalAddress() {
+ return localAddress;
+ }
+
+ @Override
+ public InetSocketAddress getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ /**
* @see org.apache.james.protocols.api.ProtocolSession#getRemoteHost()
*/
public String getRemoteHost() {
-return socketAddress.getHostName();
+return remoteAddress.getHostName();
}
/**
* @see org.apache.james.protocols.api.ProtocolSession#getRemoteIPAddress()
*/
public String getRemoteIPAddress() {
-return socketAddress.getAddress().getHostAddress();
+return remoteAddress.getAddress().getHostAddress();
}
/**
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=1203663&r1=1203662&r2=1203663&view=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 14:25:15 2011
@@ -19,6 +19,7 @@
package org.apache.james.protocols.api;
+import java.net.InetSocketAddress;
import java.util.Map;
import org.slf4j.Logger;
@@ -63,16 +64,25 @@ public interface ProtocolSession {
* Returns host name of the client
*
* @return hostname of the client
+ * @deprecated use {@link #getRemoteAddress()}
*/
+@Deprecated
String getRemoteHost();
/**
* Returns host ip address of the client
*
* @return host ip address of the client
+ * @deprecated use {@link #getRemoteAddress()}
*/
+@Deprecated
String getRemoteIPAddress();
+
+InetSocketAddress getLocalAddress();
+
+InetSocketAddress getRemoteAddress();
+
/**
* 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=1203663&r1=1203662&r2=1203663&view=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 14:25:15 2011
@@ -36,6 +36
[jira] [Created] (PROTOCOLS-50) Allow to access the local bound address and the remote bound address
Allow to access the local bound address and the remote bound address Key: PROTOCOLS-50 URL: https://issues.apache.org/jira/browse/PROTOCOLS-50 Project: JAMES Protocols Issue Type: New Feature Components: api Affects Versions: 1.6-beta2 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta3 Sometimes its useful to also be able to access the InetSocketAddress which is bound to the local side of the connection. We should support this -- 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-49) Allow to suspend reads in the ProtocolTransport
[ https://issues.apache.org/jira/browse/PROTOCOLS-49?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-49. Resolution: Fixed > Allow to suspend reads in the ProtocolTransport > --- > > Key: PROTOCOLS-49 > URL: https://issues.apache.org/jira/browse/PROTOCOLS-49 > Project: JAMES Protocols > Issue Type: New Feature >Affects Versions: 1.6-beta2 > Reporter: Norman Maurer >Assignee: Norman Maurer > Fix For: 1.6-beta3 > > > Sometimes it is useful to suspend reads in the ProtocolTransport, so no new > lines get dispatched to the LineHandler. We should allow to suspend the reads > in ProtocolTransport somehow. -- 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: r1203641 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
Author: norman
Date: Fri Nov 18 13:25:49 2011
New Revision: 1203641
URL: http://svn.apache.org/viewvc?rev=1203641&view=rev
Log:
Allow to suspend reads in the ProtocolTransport. See PROTOCOLS-49
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
james/protocols/trunk/pop3/.classpath
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=1203641&r1=1203640&r2=1203641&view=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 13:25:49 2011
@@ -86,5 +86,19 @@ public interface ProtocolTransport {
* @return lineCount
*/
int getPushedLineHandlerCount();
+
+
+/**
+ * Set the {@link ProtocolTransport} readable or not. If its not readable
then no new lines should get processed
+ *
+ * @param readable
+ */
+void setReadable(boolean readable);
+/**
+ * Return true if the channel is readable
+ *
+ * @return
+ */
+boolean isReadable();
}
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java?rev=1203641&r1=1203640&r2=1203641&view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
Fri Nov 18 13:25:49 2011
@@ -135,6 +135,16 @@ public class NettyProtocolTransport exte
protected void writeToClient(InputStream in, ProtocolSession session) {
channel.write(new ChunkedStream(in));
}
+
+ @Override
+ public void setReadable(boolean readable) {
+ channel.setReadable(readable);
+ }
+
+ @Override
+ public boolean isReadable() {
+ return channel.isReadable();
+ }
Modified: james/protocols/trunk/pop3/.classpath
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/.classpath?rev=1203641&r1=1203640&r2=1203641&view=diff
==
--- james/protocols/trunk/pop3/.classpath (original)
+++ james/protocols/trunk/pop3/.classpath Fri Nov 18 13:25:49 2011
@@ -1,6 +1,7 @@
+
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (PROTOCOLS-49) Allow to suspend reads in the ProtocolTransport
Allow to suspend reads in the ProtocolTransport --- Key: PROTOCOLS-49 URL: https://issues.apache.org/jira/browse/PROTOCOLS-49 Project: JAMES Protocols Issue Type: New Feature Affects Versions: 1.6-beta2 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 1.6-beta3 Sometimes it is useful to suspend reads in the ProtocolTransport, so no new lines get dispatched to the LineHandler. We should allow to suspend the reads in ProtocolTransport somehow. -- 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: r1203635 - /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/
Author: norman
Date: Fri Nov 18 13:12:48 2011
New Revision: 1203635
URL: http://svn.apache.org/viewvc?rev=1203635&view=rev
Log:
CommandHandler.getImplCommands() should use a static Collection. See
PROTOCOLS-48
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java?rev=1203635&r1=1203634&r2=1203635&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
Fri Nov 18 13:12:48 2011
@@ -20,7 +20,9 @@
package org.apache.james.protocols.pop3.core;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
@@ -35,9 +37,10 @@ import org.apache.james.protocols.pop3.P
/**
* This handler is used to handle CAPA commands
*/
-public class CapaCmdHandler implements CommandHandler,
ExtensibleHandler, CapaCapability {
-public final static String COMMAND_NAME = "CAPA";
+public class CapaCmdHandler implements CommandHandler,
ExtensibleHandler, CapaCapability {
private List caps;
+private static final Collection COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("CAPA"));
+private static final List CAPS =
Collections.unmodifiableList(Arrays.asList("PIPELINING"));
/**
* @see
@@ -82,18 +85,14 @@ public class CapaCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection getImplCommands() {
-List commands = new ArrayList();
-commands.add(COMMAND_NAME);
-return commands;
+return COMMANDS;
}
/**
* @see
org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
*/
public List getImplementedCapabilities(POP3Session session) {
-List cList = new ArrayList();
-cList.add("PIPELINING");
-return cList;
+ return CAPS;
}
}
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java?rev=1203635&r1=1203634&r2=1203635&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
Fri Nov 18 13:12:48 2011
@@ -19,8 +19,9 @@
package org.apache.james.protocols.pop3.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import org.apache.james.protocols.api.Request;
@@ -34,7 +35,7 @@ import org.apache.james.protocols.pop3.m
* Handles DELE command
*/
public class DeleCmdHandler implements CommandHandler {
-private final static String COMMAND_NAME = "DELE";
+private static final Collection COMMANDS =
Collect
[jira] [Resolved] (PROTOCOLS-48) CommandHandler.getImplCommands() should use a static Collection
[ https://issues.apache.org/jira/browse/PROTOCOLS-48?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-48. Resolution: Fixed > CommandHandler.getImplCommands() should use a static Collection > --- > > Key: PROTOCOLS-48 > URL: https://issues.apache.org/jira/browse/PROTOCOLS-48 > Project: JAMES Protocols > Issue Type: Improvement > Components: pop3 >Affects Versions: 1.6-beta3 >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
[jira] [Created] (PROTOCOLS-48) CommandHandler.getImplCommands() should use a static Collection
CommandHandler.getImplCommands() should use a static Collection --- Key: PROTOCOLS-48 URL: https://issues.apache.org/jira/browse/PROTOCOLS-48 Project: JAMES Protocols Issue Type: Improvement Components: pop3 Affects Versions: 1.6-beta3 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
svn commit: r1203630 - in /james/server/trunk/pop3server/src: main/java/org/apache/james/pop3server/core/ main/java/org/apache/james/pop3server/mailbox/ test/java/org/apache/james/pop3server/
Author: norman
Date: Fri Nov 18 12:55:53 2011
New Revision: 1203630
URL: http://svn.apache.org/viewvc?rev=1203630&view=rev
Log:
Create Mailbox for user if it not exist yet and handle pop before smtp. See
PROTOCOL-2
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java?rev=1203630&r1=1203629&r2=1203630&view=diff
==
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java
Fri Nov 18 12:55:53 2011
@@ -20,13 +20,34 @@ package org.apache.james.pop3server.core
import javax.annotation.Resource;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
+import org.apache.james.protocols.pop3.POP3Response;
+import org.apache.james.protocols.pop3.POP3Session;
import org.apache.james.protocols.pop3.core.PassCmdHandler;
import org.apache.james.protocols.pop3.mailbox.MailboxFactory;
-public class JamesPassCmdHandler extends PassCmdHandler{
+/**
+ * {@link PassCmdHandler} which also handles POP3 Before SMTP
+ *
+ *
+ */
+public class JamesPassCmdHandler extends PassCmdHandler {
@Resource(name = "mailboxfactory")
public void setMailboxFactory(MailboxFactory factory) {
super.setMailboxFactory(factory);
}
+
+@Override
+public Response onCommand(POP3Session session, Request request) {
+Response response = super.onCommand(session, request);
+if (POP3Response.OK_RESPONSE.equals(response.getRetCode())) {
+POP3BeforeSMTPHelper.addIPAddress(session.getRemoteIPAddress());
+}
+return response;
+}
+
+
}
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java?rev=1203630&r1=1203629&r2=1203630&view=diff
==
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java
Fri Nov 18 12:55:53 2011
@@ -47,6 +47,12 @@ public class JamesMailboxFactory impleme
try {
mSession = manager.login(session.getUser(), password,
session.getLogger());
manager.startProcessingRequest(mSession);
+MailboxPath inbox = MailboxPath.inbox(mSession);
+
+// check if the mailbox exists, if not create it
+if (!manager.mailboxExists(inbox, mSession)) {
+manager.createMailbox(inbox, mSession);
+}
MessageManager mailbox =
manager.getMailbox(MailboxPath.inbox(mSession), mSession);
return new MailboxAdapter(manager, mailbox, mSession);
} catch (BadCredentialsException e) {
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1203630&r1=1203629&r2=1203630&view=diff
==
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Fri Nov 18 12:55:53 2011
@@ -129,7 +129,7 @@ public class POP3ServerTest extends Test
//chain.put("mailboxmanager", manager);
JamesMailboxFactory mailboxFactory = new JamesMailboxFactory();
mailboxFactory.setMailboxManager(manager);
-chain.put("mailboxFactory", mailboxFactory);
+chain.put("mailboxfactory", mailboxFactory);
fSystem = new MockFileSystem();
chain.put("filesystem", fSystem);
@@ -151,7 +151,7 @@ public class POP3ServerTest extends Test
chain.dispose();
m_pop3Server.destroy();
-
+
super.tearDown();
}
--
svn commit: r1203628 - /james/server/trunk/pom.xml
Author: norman
Date: Fri Nov 18 12:43:17 2011
New Revision: 1203628
URL: http://svn.apache.org/viewvc?rev=1203628&view=rev
Log:
cleanup pom.xml. See PROTOCOLS-2
Modified:
james/server/trunk/pom.xml
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1203628&r1=1203627&r2=1203628&view=diff
==
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Nov 18 12:43:17 2011
@@ -291,6 +291,7 @@
org.apache.james.protocols
protocols-pop3
+${protocols.version}
org.apache.james.protocols
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203626 - in /james/server/trunk/pop3server/src: main/java/org/apache/james/pop3server/ main/java/org/apache/james/pop3server/core/ main/java/org/apache/james/pop3server/jmx/ main/java/or
Author: norman Date: Fri Nov 18 12:42:58 2011 New Revision: 1203626 URL: http://svn.apache.org/viewvc?rev=1203626&view=rev Log: Reuse code from protocols-pop3. See PROTOCOLS-2 Added: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java (with props) james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java (with props) james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java (with props) Removed: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3HandlerConfiguration.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3SessionImpl.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3StreamResponse.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/ReadByteFilterInputStream.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CRLFTerminatedInputStream.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCapability.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ExtraDotInputStream.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/MessageMetaData.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractInputStreamTest.java james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/CRLFTerminatedInputStreamTest.java james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/ExtraDotInputStreamTest.java Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java URL: http://svn.apache.org/viewvc/j
svn commit: r1203623 - in /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3: core/QuitCmdHandler.java core/WelcomeMessageHandler.java mailbox/AbstractMailbox.java mailbox/Mailb
Author: norman
Date: Fri Nov 18 12:31:55 2011
New Revision: 1203623
URL: http://svn.apache.org/viewvc?rev=1203623&view=rev
Log:
Add close method to Mailbox and allow easy reuse of WelcomeMessageHandler. See
PROTOCOLS-2
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/Mailbox.java
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java?rev=1203623&r1=1203622&r2=1203623&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
Fri Nov 18 12:31:55 2011
@@ -19,6 +19,7 @@
package org.apache.james.protocols.pop3.core;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -49,8 +50,9 @@ public class QuitCmdHandler implements C
return response;
}
List toBeRemoved = (List)
session.getState().get(POP3Session.DELETED_UID_LIST);
+Mailbox mailbox = session.getUserMailbox();
try {
-Mailbox mailbox = session.getUserMailbox();
+;
long uids[] = new long[toBeRemoved.size()];
for (int i = 0;i < toBeRemoved.size(); i++) {
uids[i] = toBeRemoved.get(i);
@@ -60,9 +62,13 @@ public class QuitCmdHandler implements C
} catch (Exception ex) {
response = new POP3Response(POP3Response.ERR_RESPONSE, "Some
deleted messages were not removed");
session.getLogger().error("Some deleted messages were not
removed", ex);
-}
+}
response.setEndSession(true);
-
+try {
+ mailbox.close();
+ } catch (IOException e) {
+ // ignore on close
+ }
return response;
}
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java?rev=1203623&r1=1203622&r2=1203623&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
Fri Nov 18 12:31:55 2011
@@ -26,9 +26,6 @@ import org.apache.james.protocols.pop3.P
import org.apache.james.protocols.pop3.POP3Session;
public class WelcomeMessageHandler implements ConnectHandler {
-/** POP3 Server identification string used in POP3 headers */
-private static final String softwaretype = "JAMES POP3 Server ";// +
-//
Constants.SOFTWARE_VERSION;
/**
* @see org.apache.james.protocols.api.handler.ConnectHandler
@@ -38,9 +35,13 @@ public class WelcomeMessageHandler imple
StringBuilder responseBuffer = new StringBuilder();
// Initially greet the connector
// Format is: Sat, 24 Jan 1998 13:16:09 -0500
-
responseBuffer.append(session.getConfigurationData().getHelloName()).append("
POP3 server (").append(softwaretype).append(") ready ");
+
responseBuffer.append(session.getConfigurationData().getHelloName()).append("
POP3 server (").append(getProductName()).append(") ready ");
POP3Response response = new POP3Response(POP3Response.OK_RESPONSE,
responseBuffer.toString());
return response;
}
+protected String getProductName() {
+return "JAMES Protocols POP3 Server";
+}
+
}
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java?rev=1203623&r1=1203622&r2=1203623&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
(or
svn commit: r1203601 - in /james/server/trunk: pom.xml pop3server/pom.xml
Author: norman
Date: Fri Nov 18 11:15:45 2011
New Revision: 1203601
URL: http://svn.apache.org/viewvc?rev=1203601&view=rev
Log:
move to protocols-1.6-beta3 and import pop3 dependency. See PROTOCOLS-2
Modified:
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1203601&r1=1203600&r2=1203601&view=diff
==
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Nov 18 11:15:45 2011
@@ -101,7 +101,7 @@
0.4-SNAPSHOT
0.3-SNAPSHOT
${project.version}
-1.6-beta2
+1.6-beta3-SNAPSHOT
0.4
2.2.5
0.90.3
@@ -290,6 +290,10 @@
org.apache.james.protocols
+protocols-pop3
+
+
+org.apache.james.protocols
protocols-smtp
${protocols.version}
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1203601&r1=1203600&r2=1203601&view=diff
==
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Fri Nov 18 11:15:45 2011
@@ -59,6 +59,10 @@
protocols-api
+org.apache.james.protocols
+protocols-pop3
+
+
org.apache.james
apache-james-mailbox-api
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (PROTOCOLS-2) Add pop3 protocol implementation
[ https://issues.apache.org/jira/browse/PROTOCOLS-2?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-2. --- Resolution: Fixed Fix Version/s: 1.6-beta3 Done! > Add pop3 protocol implementation > > > Key: PROTOCOLS-2 > URL: https://issues.apache.org/jira/browse/PROTOCOLS-2 > Project: JAMES Protocols > Issue Type: New Feature >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
svn commit: r1203589 - /james/protocols/trunk/pop3/pom.xml
Author: norman Date: Fri Nov 18 10:58:18 2011 New Revision: 1203589 URL: http://svn.apache.org/viewvc?rev=1203589&view=rev Log: cleanup pom.xml. See PROTOCOLS-2 Modified: james/protocols/trunk/pop3/pom.xml Modified: james/protocols/trunk/pop3/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/pom.xml?rev=1203589&r1=1203588&r2=1203589&view=diff == --- james/protocols/trunk/pop3/pom.xml (original) +++ james/protocols/trunk/pop3/pom.xml Fri Nov 18 10:58:18 2011 @@ -30,7 +30,7 @@ org.apache.james.protocols protocols-pop3 -Apache James Protocols SMTP +Apache James Protocols POP3 @@ -42,14 +42,6 @@ slf4j-api -commons-codec -commons-codec - - -org.apache.geronimo.javamail -geronimo-javamail_1.4_mail - - junit junit test - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203587 - in /james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core: AbstractInputStreamTest.java CRLFTerminatedInputStreamTest.java ExtraDotInputStreamTest.java
Author: norman
Date: Fri Nov 18 10:57:06 2011
New Revision: 1203587
URL: http://svn.apache.org/viewvc?rev=1203587&view=rev
Log:
Add tests from server to protocols pop3. See PROTOCOLS-2
Added:
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/CRLFTerminatedInputStreamTest.java
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/ExtraDotInputStreamTest.java
Added:
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java?rev=1203587&view=auto
==
---
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java
(added)
+++
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java
Fri Nov 18 10:57:06 2011
@@ -0,0 +1,59 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the*
+ * specific language governing permissions and limitations *
+ * under the License. *
+ /
+package org.apache.james.protocols.pop3.core;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import junit.framework.TestCase;
+
+
+public abstract class AbstractInputStreamTest extends TestCase{
+
+protected void checkRead(InputStream in, String expected) throws
IOException {
+ByteArrayOutputStream out = new ByteArrayOutputStream();
+int i = -1;
+while ((i = in.read()) != -1) {
+out.write(i);
+}
+in.close();
+out.close();
+assertEquals(expected, new String(out.toByteArray()));
+
+
+
+}
+
+protected void checkReadViaArray(InputStream in, String expected) throws
IOException {
+ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+byte[] buf = new byte[3];
+int i = 0;
+while ((i = in.read(buf)) != -1) {
+out.write(buf, 0, i);
+}
+
+
+in.close();
+out.close();
+assertEquals(expected, new String(out.toByteArray()));
+
+
+}
+}
Added:
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/CRLFTerminatedInputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/CRLFTerminatedInputStreamTest.java?rev=1203587&view=auto
==
---
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/CRLFTerminatedInputStreamTest.java
(added)
+++
james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/CRLFTerminatedInputStreamTest.java
Fri Nov 18 10:57:06 2011
@@ -0,0 +1,49 @@
+/
+ * 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, *
svn commit: r1203586 - in /james/protocols/trunk/pop3/src/test: ./ java/ java/org/ java/org/apache/ java/org/apache/james/ java/org/apache/james/protocols/ java/org/apache/james/protocols/pop3/ java/o
Author: norman Date: Fri Nov 18 10:55:56 2011 New Revision: 1203586 URL: http://svn.apache.org/viewvc?rev=1203586&view=rev Log: Prepare to move tests Added: james/protocols/trunk/pop3/src/test/ james/protocols/trunk/pop3/src/test/java/ james/protocols/trunk/pop3/src/test/java/org/ james/protocols/trunk/pop3/src/test/java/org/apache/ james/protocols/trunk/pop3/src/test/java/org/apache/james/ james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/ james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/ james/protocols/trunk/pop3/src/test/java/org/apache/james/protocols/pop3/core/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203583 - in /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3: core/RetrCmdHandler.java core/TopCmdHandler.java mailbox/AbstractMailbox.java mailbox/Mailbox.java
Author: norman
Date: Fri Nov 18 10:54:16 2011
New Revision: 1203583
URL: http://svn.apache.org/viewvc?rev=1203583&view=rev
Log:
Add some more methods to mailbox to full-fill all needs for pop3. See
PROTOCOLS-2
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/Mailbox.java
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java?rev=1203583&r1=1203582&r2=1203583&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
Fri Nov 18 10:54:16 2011
@@ -63,7 +63,7 @@ public class RetrCmdHandler implements C
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
-InputStream content =
session.getUserMailbox().getMessageContent(uid);
+InputStream content =
session.getUserMailbox().getMessage(uid);
if (content != null) {
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java?rev=1203583&r1=1203582&r2=1203583&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
Fri Nov 18 10:54:16 2011
@@ -21,6 +21,7 @@ package org.apache.james.protocols.pop3.
import java.io.IOException;
import java.io.InputStream;
+import java.io.SequenceInputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -82,13 +83,10 @@ public class TopCmdHandler extends RetrC
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
-InputStream content =
session.getUserMailbox().getMessageContent(uid);
-
-if (content != null) {
-InputStream in = new CountingBodyInputStream(new
ExtraDotInputStream(new CRLFTerminatedInputStream(content)), lines);
-
-
-response = new
POP3StreamResponse(POP3Response.OK_RESPONSE, "Message follows", in);
+InputStream body = new CountingBodyInputStream(new
ExtraDotInputStream(new
CRLFTerminatedInputStream(session.getUserMailbox().getMessageBody(uid))),
lines);
+InputStream headers =
session.getUserMailbox().getMessageHeaders(uid);
+if (body != null && headers != null) {
+response = new
POP3StreamResponse(POP3Response.OK_RESPONSE, "Message follows", new
SequenceInputStream(headers, body));
return response;
} else {
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java?rev=1203583&view=auto
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
(added)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
Fri Nov 18 10:54:16 2011
@@ -0,0 +1,33 @@
+/
+ * 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 *
+ *
svn commit: r1203578 - in /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3: ./ core/ mailbox/
Author: norman Date: Fri Nov 18 10:44:46 2011 New Revision: 1203578 URL: http://svn.apache.org/viewvc?rev=1203578&view=rev Log: move mailbox stuff to extra package. See PROTOCOLS-2 Added: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/Mailbox.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MailboxFactory.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java Removed: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MailboxFactory.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MessageMetaData.java Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java?rev=1203578&r1=1203577&r2=1203578&view=diff == --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java Fri Nov 18 10:44:46 2011 @@ -20,6 +20,7 @@ package org.apache.james.protocols.pop3; import org.apache.james.protocols.api.ProtocolSession; +import org.apache.james.protocols.pop3.mailbox.Mailbox; /** * All the handlers access this interface to communicate with POP3Handler object @@ -29,7 +30,6 @@ public interface POP3Session extends Pro final static String UID_LIST = "UID_LIST"; final static String DELETED_UID_LIST = "DELETED_UID_LIST"; -final static String MAILBOX_SESSION = "MAILBOX_SESSION"; // Authentication states for the POP3 interaction /** Waiting for user id */ Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java?rev=1203578&r1=1203577&r2=1203578&view=diff == --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java Fri Nov 18 10:44:46 2011 @@ -21,6 +21,7 @@ package org.apache.james.protocols.pop3; import org.apache.james.protocols.api.AbstractSession; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.Response; +import org.apache.james.protocols.pop3.mailbox.Mailbox; import org.slf4j.Logger; /** Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java?rev=1203578&r1=1203577&r2=1203578&view=diff == --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java Fri Nov 18 10:44:46 2011 @@ -26,9 +26,9 @@ import java.util.List; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; -import org.apache.james.p
svn commit: r1203577 - in /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3: ./ core/
Author: norman
Date: Fri Nov 18 10:42:13 2011
New Revision: 1203577
URL: http://svn.apache.org/viewvc?rev=1203577&view=rev
Log:
pop3 code in protocols does now not depend on mailbox-api anymore. See
PROTOCOL-2
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MailboxFactory.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MessageMetaData.java
Removed:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/ReadByteFilterInputStream.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaData.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/POP3CommandHandlerResultLogger.java
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CoreCmdHandlerLoader.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/ExtraDotInputStream.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/POP3CommandDispatcherLineHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
Modified:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java?rev=1203577&r1=1203576&r2=1203577&view=diff
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
(original)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
Fri Nov 18 10:42:13 2011
@@ -18,6 +18,49 @@
/
package org.apache.james.protocols.pop3;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+
+/**
+ * A Mailbox which is used in POP3 to retrieve messages
+ *
+ *
+ */
public interface Mailbox {
+
+ /**
+* Returns the message content as {@link InputStream} or
null if no message can be found for the given uid
+*
+* @param uid
+* @return content
+* @throws IOException
+*/
+ InputStream getMessageContent(long uid) throws IOException;
+
+ /**
+* Return a immutable {@link List} which holds the {@link
MessageMetaData} for all messages in the {@link Mailbox}
+*
+* @return messages
+* @throws IOException
+*/
+ List getMessages() throws IOException;;
+
+ /**
+* Remove the messages with the given uids
+*
+* @param uids
+*/
+ void remove(long... uids) throws IOException;
+
+
+ /**
+* Return the identifier for the mailbox. This MUST not change
+*
+* @return identifer
+* @throws IOException
+*/
+ String getIdentifier() throws IOException;
}
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MailboxFactory.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MailboxFactory.java?rev=1203577&view=auto
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MailboxFactory.java
(added)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/MailboxFactory.java
Fri Nov 18 10:42:13 2011
@@ -0,0 +1,40 @@
+/
+ * 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 copyr
svn commit: r1203564 - /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/pop3server/
Author: norman Date: Fri Nov 18 10:03:07 2011 New Revision: 1203564 URL: http://svn.apache.org/viewvc?rev=1203564&view=rev Log: Remove code which will stay in james server. See PROTOCOLS-2 Removed: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/pop3server/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203562 [2/2] - in /james/protocols/trunk/pop3: .settings/ src/main/java/org/apache/james/protocols/pop3/ src/main/java/org/apache/james/protocols/pop3/core/ src/main/java/org/apache/jame
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java?rev=1203562&view=auto
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
(added)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
Fri Nov 18 10:00:50 2011
@@ -0,0 +1,99 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the*
+ * specific language governing permissions and limitations *
+ * under the License. *
+ /
+
+package org.apache.james.protocols.pop3.core;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.mail.Flags;
+
+import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.pop3server.POP3Response;
+import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
+
+/**
+ * Handles QUIT command
+ */
+public class QuitCmdHandler implements CommandHandler {
+private final static String COMMAND_NAME = "QUIT";
+protected MailboxManager mailboxManager;
+
+@Resource(name = "mailboxmanager")
+public void setMailboxManager(MailboxManager manager) {
+this.mailboxManager = manager;
+}
+
+/**
+ * Handler method called upon receipt of a QUIT command. This method
handles
+ * cleanup of the POP3Handler state.
+ */
+@SuppressWarnings("unchecked")
+public Response onCommand(POP3Session session, Request request) {
+POP3Response response = null;
+if (session.getHandlerState() == POP3Session.AUTHENTICATION_READY ||
session.getHandlerState() == POP3Session.AUTHENTICATION_USERSET) {
+response = new POP3Response(POP3Response.OK_RESPONSE, "Apache
James POP3 Server signing off.");
+response.setEndSession(true);
+return response;
+}
+MailboxSession mailboxSession = (MailboxSession)
session.getState().get(POP3Session.MAILBOX_SESSION);
+
+List toBeRemoved = (List)
session.getState().get(POP3Session.DELETED_UID_LIST);
+try {
+MessageManager mailbox = session.getUserMailbox();
+
+for (int i = 0; i < toBeRemoved.size(); i++) {
+MessageRange range = MessageRange.one(toBeRemoved.get(i));
+mailbox.setFlags(new Flags(Flags.Flag.DELETED), true, false,
range, mailboxSession);
+mailbox.expunge(range, mailboxSession);
+}
+response = new POP3Response(POP3Response.OK_RESPONSE, "Apache
James POP3 Server signing off.");
+} catch (Exception ex) {
+response = new POP3Response(POP3Response.ERR_RESPONSE, "Some
deleted messages were not removed");
+session.getLogger().error("Some deleted messages were not
removed", ex);
+}
+response.setEndSession(true);
+try {
+mailboxManager.logout(mailboxSession, false);
+} catch (MailboxException e) {
+// nothing todo on logout
+}
+
+return response;
+}
+
+/**
+ * @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
+ */
+public Collection getImplCommands() {
+List commands = new ArrayList();
+commands.add(COMMAND_NAME);
+return commands;
+}
+
+}
Added:
james/protocols/trunk/pop3/src/main/java/org/apache
svn commit: r1203559 - /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/pop3server/
Author: norman Date: Fri Nov 18 09:52:40 2011 New Revision: 1203559 URL: http://svn.apache.org/viewvc?rev=1203559&view=rev Log: Copy over to work on integration into protocols without loosing history. See PROTOCOLS-2 Added: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/pop3server/ (props changed) - copied from r1203558, james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/ Propchange: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/pop3server/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 18 09:52:40 2011 @@ -0,0 +1,2 @@ +/james/server/sandbox/active/mina_experiments/pop3server/src/main/java/org/apache/james/pop3server:824613-825114 +/james/server/sandbox/active/pure_spring_deployment/pop3server/src/main/java/org/apache/james/pop3server:893986-896410 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203558 - /james/protocols/trunk/pop3/.settings/
Author: norman Date: Fri Nov 18 09:49:03 2011 New Revision: 1203558 URL: http://svn.apache.org/viewvc?rev=1203558&view=rev Log: add stuff to svn:ignore Added: james/protocols/trunk/pop3/.settings/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203554 - /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/
Author: norman Date: Fri Nov 18 09:43:30 2011 New Revision: 1203554 URL: http://svn.apache.org/viewvc?rev=1203554&view=rev Log: Remove so we can do a svn copy which will help to preserve history Removed: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3HandlerConfiguration.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Request.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/ReadByteFilterInputStream.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/StartTlsPop3Response.java - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203552 - in /james/protocols/trunk/pop3: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/james/ src/main/java/org/apache/james/prot
Author: norman
Date: Fri Nov 18 09:41:36 2011
New Revision: 1203552
URL: http://svn.apache.org/viewvc?rev=1203552&view=rev
Log:
Start to move pop3 code from server to protocols. See PROTOCOLS-2
Added:
james/protocols/trunk/pop3/.classpath
james/protocols/trunk/pop3/.project
james/protocols/trunk/pop3/src/
james/protocols/trunk/pop3/src/main/
james/protocols/trunk/pop3/src/main/java/
james/protocols/trunk/pop3/src/main/java/org/
james/protocols/trunk/pop3/src/main/java/org/apache/
james/protocols/trunk/pop3/src/main/java/org/apache/james/
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3HandlerConfiguration.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Request.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Session.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/ReadByteFilterInputStream.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/StartTlsPop3Response.java
Added: james/protocols/trunk/pop3/.classpath
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/.classpath?rev=1203552&view=auto
==
--- james/protocols/trunk/pop3/.classpath (added)
+++ james/protocols/trunk/pop3/.classpath Fri Nov 18 09:41:36 2011
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
Added: james/protocols/trunk/pop3/.project
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/.project?rev=1203552&view=auto
==
--- james/protocols/trunk/pop3/.project (added)
+++ james/protocols/trunk/pop3/.project Fri Nov 18 09:41:36 2011
@@ -0,0 +1,24 @@
+
+
+ protocols-pop3
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java?rev=1203552&view=auto
==
---
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
(added)
+++
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/Mailbox.java
Fri Nov 18 09:41:36 2011
@@ -0,0 +1,24 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the*
+ * specific language governing permissions and limitations *
+ * under the License. *
+ /
+
+package org.apache.james.protocols.pop3;
+
+public interface Mailbox {
+
+}
Added:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3HandlerConfiguration.java
URL:
http://svn.apache.org/v
svn commit: r1203550 - /james/protocols/trunk/pop3/
Author: norman Date: Fri Nov 18 09:33:06 2011 New Revision: 1203550 URL: http://svn.apache.org/viewvc?rev=1203550&view=rev Log: ignore target Modified: james/protocols/trunk/pop3/ (props changed) Propchange: james/protocols/trunk/pop3/ -- --- svn:ignore (added) +++ svn:ignore Fri Nov 18 09:33:06 2011 @@ -0,0 +1 @@ +target - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1203549 - in /james/protocols/trunk: pom.xml pop3/ pop3/pom.xml
Author: norman
Date: Fri Nov 18 09:32:06 2011
New Revision: 1203549
URL: http://svn.apache.org/viewvc?rev=1203549&view=rev
Log:
Prepare to add pop3 code. See PROTOCOLS-2
Added:
james/protocols/trunk/pop3/
james/protocols/trunk/pop3/pom.xml
Modified:
james/protocols/trunk/pom.xml
Modified: james/protocols/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1203549&r1=1203548&r2=1203549&view=diff
==
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Fri Nov 18 09:32:06 2011
@@ -42,6 +42,7 @@
smtp
lmtp
impl
+pop3
@@ -61,6 +62,11 @@
org.apache.james.protocols
+protocols-pop3
+${project.version}
+
+
+org.apache.james.protocols
protocols-lmtp
${project.version}
Added: james/protocols/trunk/pop3/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/pom.xml?rev=1203549&view=auto
==
--- james/protocols/trunk/pop3/pom.xml (added)
+++ james/protocols/trunk/pop3/pom.xml Fri Nov 18 09:32:06 2011
@@ -0,0 +1,104 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+
+protocols
+org.apache.james
+1.6-beta3-SNAPSHOT
+../pom.xml
+
+
+org.apache.james.protocols
+protocols-pop3
+
+Apache James Protocols SMTP
+
+
+
+org.apache.james.protocols
+protocols-api
+
+
+org.slf4j
+slf4j-api
+
+
+commons-codec
+commons-codec
+
+
+org.apache.geronimo.javamail
+geronimo-javamail_1.4_mail
+
+
+junit
+junit
+test
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+
true
+
true
+
+
+
+
+
+
+test-jar
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+bundle-manifest
+process-classes
+
+manifest
+
+
+
+true
+
+
+
org.apache.james.protocols.pop3.*
+*;scope=runtime
+
+
+
+
+
+
\ No newline at end of file
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
Re: Problems because of emma plugin
Nice! Thanks for the help :) Bye, Norman 2011/11/18 Felix Knecht : > Hi Norman > > On 11/17/2011 08:18 AM, Norman Maurer wrote: >> >> 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". > > svn trunk of protocols uses as parent the james-project-1-8.SNAPSHOT.pom > now. For me the niosmtp builds fine without any dependency of emma - after > building before the james-project and the james-protocol dependency from > trunk. I committed the changes in protocol also, but it will take it's time > until they are via CI as SNAPSHOTs available. > > Thanks for heads up > Felix > >> >> 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 >> > > > - > 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=1203348&view=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=1203348&r1=1203347&r2=1203348&view=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
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 : > 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 Knecht: >>> On 10/18/2011 04:42 PM, Stefano Bagnara wrote: >>>> >>>> 2011/10/18: >>>>> >>>>> Author: felixk >>>>> Date: Tue Oct 18 13:52:43 2011 >>>>> New Revision: 1185659 >>>>> >>>>> URL: http://svn.apache.org/viewvc?rev=1185659&view=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 > >
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
[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
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=1202747&view=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=1202747&r1=1202746&r2=1202747&view=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 List 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 true
+ *
+ * @param listener
+ */
+public synchronized void addListener(IFutureSPFResultListener listener) {
+if (!isReady) {
+if (listeners == null) {
+listeners = new ArrayList();
+}
+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 true. 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] [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
[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
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=1199394&view=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=1199394&r1=1199393&r2=1199394&view=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
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=1197723&view=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=1197723&r1=1197722&r2=1197723&view=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
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=1197721&view=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=1197721&r1=1197720&r2=1197721&view=diff
==
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Nov 4 19:15:31 2011
@@ -114,7 +114,7 @@
0.4-SNAPSHOT
0.3-SNAPSHOT
${project.version}
-1.6-beta1
+1.6-beta2
0.4
2.2.5
0.90.3
-
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=1197680&view=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=1197680&r1=1197679&r2=1197680&view=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
[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.(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=1197678&view=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=1197678&r1=1197677&r2=1197678&view=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] [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.(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
Re: [VOTE] Release TLP (pom.xml) Apache James Project 1.7
+1 Bye Norman 2011/11/1, Felix Knecht : > 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 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 : > 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] [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
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=1194972&view=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=1194972&r1=1194971&r2=1194972&view=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=1194972&r1=1194971&r2=1194972&view=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] [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
[jira] [Commented] (PROTOCOLS-46) HashedWheelTimer get not stopped on AbstractAsyncServer.unbind()
[ https://issues.apache.org/jira/browse/PROTOCOLS-46?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13139395#comment-13139395 ] Norman Maurer commented on PROTOCOLS-46: This leads to leaking resources > 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
Re: [VOTE] Apache James Protocols 1.6-beta2 (second take)
[x] +1 Yes do it now! Bye, Norman 2011/10/27 Norman Maurer : > 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
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 : > 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: 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=1189995&view=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=1189995&r1=1189994&r2=1189995&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189995&r1=1189994&r2=1189995&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189995&r1=1189994&r2=1189995&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189995&r1=1189994&r2=1189995&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 20:21:53 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta2 +1.6-beta3-SNAPSHOT pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk + scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189995&r1=1189994&r2=1189995&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml - 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=1189994&view=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: 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=1189991&view=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=1189991&r1=1189990&r2=1189991&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189991&r1=1189990&r2=1189991&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189991&r1=1189990&r2=1189991&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189991&r1=1189990&r2=1189991&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 20:21:10 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta3-SNAPSHOT +1.6-beta2 pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk - scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 + scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189991&r1=1189990&r2=1189991&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml - 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=1189990&view=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=1189990&r1=1189989&r2=1189990&view=diff
==
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Thu Oct 27 20:18:14 2011
@@ -74,6 +74,11 @@
org.apache.james.protocols
+protocols-lmtp
+${project.version}
+
+
+org.apache.james.protocols
protocols-smtp
${project.version}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: 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=1189988&view=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
[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: 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=1189894&view=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=1189894&r1=1189893&r2=1189894&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189894&r1=1189893&r2=1189894&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189894&r1=1189893&r2=1189894&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189894&r1=1189893&r2=1189894&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 17:53:25 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta2 +1.6-beta3-SNAPSHOT pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk + scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189894&r1=1189893&r2=1189894&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189893 - /james/protocols/tags/protocols-1.6-beta2/
Author: norman Date: Thu Oct 27 17:53:10 2011 New Revision: 1189893 URL: http://svn.apache.org/viewvc?rev=1189893&view=rev Log: [maven-release-plugin] copy for tag protocols-1.6-beta2 Added: james/protocols/tags/protocols-1.6-beta2/ - copied from r1189892, 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: 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=1189892&view=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=1189892&r1=1189891&r2=1189892&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189892&r1=1189891&r2=1189892&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189892&r1=1189891&r2=1189892&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189892&r1=1189891&r2=1189892&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 17:52:26 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta3-SNAPSHOT +1.6-beta2 pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk - scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 + scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189892&r1=1189891&r2=1189892&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml - 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=1189890&view=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: r1189889 - /james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
Author: norman
Date: Thu Oct 27 17:46:01 2011
New Revision: 1189889
URL: http://svn.apache.org/viewvc?rev=1189889&view=rev
Log:
use createCoreHandler method the right way
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java?rev=1189889&r1=1189888&r2=1189889&view=diff
==
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
Thu Oct 27 17:46:01 2011
@@ -35,9 +35,9 @@ import org.slf4j.LoggerFactory;
*/
public class NettyServer extends AbstractAsyncServer {
-private Protocol protocol;
+protected Protocol protocol;
-private Logger logger = LoggerFactory.getLogger(NettyServer.class);
+protected Logger logger = LoggerFactory.getLogger(NettyServer.class);
protected SSLContext context;
@@ -64,7 +64,7 @@ public class NettyServer extends Abstrac
public void setUseExecutionHandler(boolean useHandler, int size) {
if (isBound()) throw new IllegalStateException("Server running
already");
if (useHandler) {
-eHandler =createExecutionHandler(size);
+eHandler = createExecutionHandler(size);
} else {
if (eHandler != null) {
eHandler.releaseExternalResources();
@@ -75,12 +75,12 @@ public class NettyServer extends Abstrac
protected ChannelUpstreamHandler createCoreHandler() {
-return coreHandler;
+return new BasicChannelUpstreamHandler(protocol, logger, context,
null);
}
@Override
public synchronized void bind() throws Exception {
-coreHandler = new BasicChannelUpstreamHandler(protocol, logger,
context, null);
+coreHandler = createCoreHandler();
super.bind();
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1189856 - 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:37:04 2011 New Revision: 1189856 URL: http://svn.apache.org/viewvc?rev=1189856&view=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=1189856&r1=1189855&r2=1189856&view=diff == --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Thu Oct 27 16:37:04 2011 @@ -23,7 +23,7 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189856&r1=1189855&r2=1189856&view=diff == --- james/protocols/trunk/impl/pom.xml (original) +++ james/protocols/trunk/impl/pom.xml Thu Oct 27 16:37:04 2011 @@ -23,7 +23,7 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189856&r1=1189855&r2=1189856&view=diff == --- james/protocols/trunk/lmtp/pom.xml (original) +++ james/protocols/trunk/lmtp/pom.xml Thu Oct 27 16:37:04 2011 @@ -23,7 +23,7 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189856&r1=1189855&r2=1189856&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 16:37:04 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta2 +1.6-beta3-SNAPSHOT pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk + scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189856&r1=1189855&r2=1189856&view=diff == --- james/protocols/trunk/smtp/pom.xml (original) +++ james/protocols/trunk/smtp/pom.xml Thu Oct 27 16:37:04 2011 @@ -23,7 +23,7 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml - 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=1189854&view=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: 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=1189851&view=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=1189851&r1=1189850&r2=1189851&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1189851&r1=1189850&r2=1189851&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1189851&r1=1189850&r2=1189851&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1189851&r1=1189850&r2=1189851&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Thu Oct 27 16:36:07 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta3-SNAPSHOT +1.6-beta2 pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk - scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 + scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1189851&r1=1189850&r2=1189851&view=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 @@ protocols org.apache.james -1.6-beta3-SNAPSHOT +1.6-beta2 ../pom.xml - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
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=1189850&view=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: 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=1189846&view=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=1189846&r1=1189845&r2=1189846&view=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=1189846&r1=1189845&r2=1189846&view=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=1189846&r1=1189845&r2=1189846&view=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 true 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=1189846&r1=1189845&r2=1189846&view=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
[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
[jira] [Resolved] (PROTOCOLS-44) LMTPDataLineMessageHookHandler does not remove itself from the session once it is done
[ https://issues.apache.org/jira/browse/PROTOCOLS-44?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved PROTOCOLS-44. Resolution: Fixed > 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
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=1189699&view=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=1189699&r1=1189698&r2=1189699&view=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=1189699&r1=1189698&r2=1189699&view=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=1189699&r1=1189698&r2=1189699&view=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
[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 : > [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=true&jqlQuery=project+%3D+PROTOCOLS+AND+fixVersion+%3D+%221.6-beta2%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&mode=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
[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
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=1189698&view=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=1189698&r1=1189697&r2=1189698&view=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
Re: James in Debian
I think I would go with jdeb for now. Bye, Norman 2011/10/25 Ioan Eugen Stan : > 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
[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=true&jqlQuery=project+%3D+PROTOCOLS+AND+fixVersion+%3D+%221.6-beta2%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&mode=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: DOAP file
I think generating from maven makes sense. Bye Norman 2011/10/26, Felix Knecht : > 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: 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: 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=1188732&view=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=1188732&r1=1188731&r2=1188732&view=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. > > --> > > - > - 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";> > > +http://maven.apache.org/POM/4.0.0"; > > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > > xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 > > http://maven.apache.org/maven-v4_0_0.xsd";> > > 4.0.0 > > > > > > protocols > > org.apache.james > > -1.6-beta2-SNAPSHOT > > +1.6-beta2 > > ../pom.xml > > > > > > > > Modified: james/protocols/trunk/impl/pom.xml > > URL: > > http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1188732&r1=1188731&r2=1188732&view=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. > > --> > > - > - 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";> > > +http://maven.apache.org/POM/4.0.0"; > > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > > xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 > > http://maven.apache.org/maven-v4_0_0.xsd";> > > 4.0.0 > > > > > > protocols > > org.apache.james > > -1.6-beta2-SNAPSHOT > > +1.6-beta2 > > ../pom.xml > > > > > > > > Modified: james/protocols/trunk/lmtp/pom.xml > > URL: > > http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188732&r1=1188731&r2=1188732&view=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. > > --> > > - > - 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";> > > +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.or
[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
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=1188739&view=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=1188739&r1=1188738&r2=1188739&view=diff == --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Tue Oct 25 15:49:05 2011 @@ -992,7 +992,7 @@ org.jboss.netty netty -3.2.5.Final +3.2.6.Final compile - 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: 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=1188734&view=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=1188734&r1=1188733&r2=1188734&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1188734&r1=1188733&r2=1188734&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/lmtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1188734&r1=1188733&r2=1188734&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1188734&r1=1188733&r2=1188734&view=diff == --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Oct 25 15:45:16 2011 @@ -29,7 +29,7 @@ org.apache.james protocols -1.6-beta2 +1.6-beta3-SNAPSHOT pom Apache James Protocols @@ -45,9 +45,9 @@ - scm:svn:http://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - scm:svn:https://svn.apache.org/repos/asf/james/protocols/tags/protocols-1.6-beta2 - http://svn.apache.org/viewcvs.cgi/james/protocols/trunk/tags/protocols-1.6-beta2?root=Apache-SVN + scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk + scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk + http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN hudson Modified: james/protocols/trunk/smtp/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1188734&r1=1188733&r2=1188734&view=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 @@ protocols org.apache.james -1.6-beta2 +1.6-beta3-SNAPSHOT ../pom.xml - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
