[jira] [Commented] (JAMES-1360) Use protocols 1.6.0-RC2-SNAPSHOT

2012-01-07 Thread Norman Maurer (Commented) (JIRA) 

[ 
https://issues.apache.org/jira/browse/JAMES-1360?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13181899#comment-13181899
 ] 

Norman Maurer commented on JAMES-1360:
--

I will have a look later today...

 Use protocols 1.6.0-RC2-SNAPSHOT
 

 Key: JAMES-1360
 URL: https://issues.apache.org/jira/browse/JAMES-1360
 Project: JAMES Server
  Issue Type: New Feature
Affects Versions: Trunk
Reporter: Eric Charles
Assignee: Eric Charles
 Fix For: 3.0-beta4


 There are a bunch of API changes between protocols-1.6-beta3 and 
 protocols-1.6.0-RC2-SNAPSHOT.
 We need to update server code (mainly pop3/imap/smtp server projects) to 
 align to the current protocols implementation.

--
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: r1228617 - /james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 14:04:52 2012
New Revision: 1228617

URL: http://svn.apache.org/viewvc?rev=1228617view=rev
Log:
Fix JamesPassCmdHandler. This is part of JAMES-1360

Modified:

james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.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=1228617r1=1228616r2=1228617view=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
 Sat Jan  7 14:04:52 2012
@@ -18,10 +18,13 @@
  /
 package org.apache.james.pop3server.core;
 
+import java.util.Collection;
+
 import javax.annotation.Resource;
 
 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.protocols.lib.POP3BeforeSMTPHelper;
 import org.apache.james.protocols.pop3.POP3Response;
 import org.apache.james.protocols.pop3.POP3Session;
@@ -32,27 +35,29 @@ import org.apache.james.protocols.pop3.m
  * {@link PassCmdHandler} which also handles POP3 Before SMTP
  * 
  */
-public class JamesPassCmdHandler extends PassCmdHandler {
+public class JamesPassCmdHandler implements CommandHandlerPOP3Session {
 
-// TODO fix me as a final field...
-private MailboxFactory factory;
+private PassCmdHandler handler;
 
 public JamesPassCmdHandler() {
-super(null);
 }
 
 @Resource(name = mailboxfactory)
 public void setMailboxFactory(MailboxFactory factory) {
-this.factory = factory;
+this.handler = new PassCmdHandler(factory);
 }
 
-@Override
 public Response onCommand(POP3Session session, Request request) {
-Response response =  super.onCommand(session, request);
+Response response =  handler.onCommand(session, request);
 if (POP3Response.OK_RESPONSE.equals(response.getRetCode())) {
 
POP3BeforeSMTPHelper.addIPAddress(session.getRemoteAddress().getAddress().toString());
 }
 return response;
 }
-
+
+@Override
+public CollectionString getImplCommands() {
+return handler.getImplCommands();
+}
+
 }



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228620 - in /james/server/trunk: pop3server/src/main/java/org/apache/james/pop3server/core/ pop3server/src/main/java/org/apache/james/pop3server/jmx/ protocols-library/src/main/java/org/

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 14:23:57 2012
New Revision: 1228620

URL: http://svn.apache.org/viewvc?rev=1228620view=rev
Log:
Fix class-cast exception which was introduced by JAMES-1360

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/JamesPassCmdHandler.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/POP3CommandHandlerStats.java

james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java

james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java

Modified: 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1228620r1=1228619r2=1228620view=diff
==
--- 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
 (original)
+++ 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
 Sat Jan  7 14:23:57 2012
@@ -59,7 +59,7 @@ public class CoreCmdHandlerLoader implem
 private final static String COMMANDDISPATCHER = 
CommandDispatcher.class.getName();
 
 // logging stuff
-private final String COMMANDHANDLERRESULTLOGGER = 
POP3CommandHandlerResultLogger.class.getName();
+private final static String COMMANDHANDLERRESULTLOGGER = 
POP3CommandHandlerResultLogger.class.getName();
 
 
 private final ListString commands = new LinkedListString();

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=1228620r1=1228619r2=1228620view=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
 Sat Jan  7 14:23:57 2012
@@ -50,7 +50,7 @@ public class JamesPassCmdHandler impleme
 public Response onCommand(POP3Session session, Request request) {
 Response response =  handler.onCommand(session, request);
 if (POP3Response.OK_RESPONSE.equals(response.getRetCode())) {
-
POP3BeforeSMTPHelper.addIPAddress(session.getRemoteAddress().getAddress().toString());
+
POP3BeforeSMTPHelper.addIPAddress(session.getRemoteAddress().getAddress().getHostAddress());
 }
 return response;
 }

Modified: 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1228620r1=1228619r2=1228620view=diff
==
--- 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
 (original)
+++ 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
 Sat Jan  7 14:23:57 2012
@@ -25,19 +25,18 @@ import org.apache.james.protocols.api.ha
 import org.apache.james.protocols.api.handler.LifecycleAwareProtocolHandler;
 import 
org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor;
 import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
-import org.apache.james.protocols.pop3.POP3Response;
 import org.apache.james.protocols.pop3.POP3Session;
 
 /**
  * Gather JMX stats for {@link CommandHandler}
  */
-public class CommandHandlerResultJMXMonitor extends 
AbstractCommandHandlerResultJMXMonitorPOP3Response, POP3Session implements 
LifecycleAwareProtocolHandler {
+public class CommandHandlerResultJMXMonitor extends 
AbstractCommandHandlerResultJMXMonitorPOP3Session implements 
LifecycleAwareProtocolHandler {
 
 /**
  * @see 
org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor
  * 
#createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler)
  */
-protected AbstractCommandHandlerStatsPOP3Response 
createCommandHandlerStats(CommandHandlerPOP3Session handler) throws Exception 
{
+protected AbstractCommandHandlerStats 
createCommandHandlerStats(CommandHandlerPOP3Session handler)

svn commit: r1228621 - in /james/server/trunk: pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java protocols-library/src/main/java/org/apache/james/protocols/lib/Slf4

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 14:31:52 2012
New Revision: 1228621

URL: http://svn.apache.org/viewvc?rev=1228621view=rev
Log:
move the logger adapter to protocols-library module

Added:

james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/Slf4jLoggerAdapter.java
   (with props)
Modified:

james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mailbox/JamesMailboxFactory.java

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=1228621r1=1228620r2=1228621view=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
 Sat Jan  7 14:31:52 2012
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.MailboxM
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
-import org.apache.james.protocols.api.logger.Slf4jLoggerAdapter;
+import org.apache.james.protocols.lib.Slf4jLoggerAdapter;
 import org.apache.james.protocols.pop3.POP3Session;
 import org.apache.james.protocols.pop3.mailbox.Mailbox;
 import org.apache.james.protocols.pop3.mailbox.MailboxFactory;

Added: 
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/Slf4jLoggerAdapter.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/Slf4jLoggerAdapter.java?rev=1228621view=auto
==
--- 
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/Slf4jLoggerAdapter.java
 (added)
+++ 
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/Slf4jLoggerAdapter.java
 Sat Jan  7 14:31:52 2012
@@ -0,0 +1,320 @@
+/
+ * 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.lib;
+
+import org.apache.james.protocols.api.logger.Logger;
+import org.slf4j.Marker;
+
+/**
+ * Adapter class for SLF4J
+ *
+ */
+public class Slf4jLoggerAdapter implements org.slf4j.Logger {
+
+private final Logger logger;
+
+public Slf4jLoggerAdapter(Logger logger) {
+this.logger = logger;
+}
+
+public boolean isDebugEnabled() {
+return logger.isDebugEnabled();
+}
+
+public boolean isErrorEnabled() {
+return logger.isErrorEnabled();
+}
+public boolean isInfoEnabled() {
+return logger.isInfoEnabled();
+}
+
+public boolean isTraceEnabled() {
+return logger.isTraceEnabled();
+}
+
+public boolean isWarnEnabled() {
+return logger.isWarnEnabled();
+}
+
+public void trace(String message) {
+logger.trace(message);
+}
+
+public void trace(String message, Throwable t) {
+logger.trace(message, t);
+}
+
+public void debug(String message) {
+logger.debug(message);
+}
+
+public void debug(String message, Throwable t) {
+logger.debug(message, t);
+}
+
+public void info(String message) {
+logger.info(message);
+}
+
+public void info(String message, Throwable t) {
+logger.info(message, t);
+}
+
+public void warn(String message) {
+logger.warn(message);
+}
+
+public void warn(String message, Throwable t) {
+logger.warn(message, t);
+}
+
+public void error(String message) {
+logger.error(message);
+}

svn commit: r1228622 - /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLoggerAdapter.java

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 14:33:42 2012
New Revision: 1228622

URL: http://svn.apache.org/viewvc?rev=1228622view=rev
Log:
The logger adapter was moved to james-server

Removed:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLoggerAdapter.java


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228630 - in /james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx: CommandHandlerResultJMXMonitor.java SMTPCommandHandlerStats.java

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 15:06:08 2012
New Revision: 1228630

URL: http://svn.apache.org/viewvc?rev=1228630view=rev
Log:
Fix class-cast exception which was introduced by JAMES-1360

Modified:

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java?rev=1228630r1=1228629r2=1228630view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
 Sat Jan  7 15:06:08 2012
@@ -23,19 +23,18 @@ import java.util.Collection;
 import org.apache.james.protocols.api.handler.CommandHandler;
 import 
org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor;
 import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
-import org.apache.james.protocols.smtp.SMTPResponse;
 import org.apache.james.protocols.smtp.SMTPSession;
 
 /**
  * Expose JMX statistics for {@link 
org.apache.james.protocols.api.handler.CommandHandler}
  */
-public class CommandHandlerResultJMXMonitor extends 
AbstractCommandHandlerResultJMXMonitorSMTPResponse, SMTPSession {
+public class CommandHandlerResultJMXMonitor extends 
AbstractCommandHandlerResultJMXMonitorSMTPSession {
 
 /**
  * @see 
org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor
  * 
#createCommandHandlerStats(org.apache.james.protocols.api.handler.CommandHandler)
  */
-protected AbstractCommandHandlerStatsSMTPResponse 
createCommandHandlerStats(CommandHandlerSMTPSession handler) throws Exception 
{
+protected AbstractCommandHandlerStats 
createCommandHandlerStats(CommandHandlerSMTPSession handler) throws Exception 
{
 CollectionString col = handler.getImplCommands();
 String cName = handler.getClass().getName();
 

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java?rev=1228630r1=1228629r2=1228630view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
 Sat Jan  7 15:06:08 2012
@@ -26,14 +26,15 @@ import javax.management.MalformedObjectN
 import javax.management.NotCompliantMBeanException;
 
 import org.apache.james.lifecycle.api.Disposable;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.CommandHandler;
 import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
-import org.apache.james.protocols.smtp.SMTPResponse;
+
 
 /**
  * Expose statistics for {@link CommandHandler} via JMX
  */
-public class SMTPCommandHandlerStats extends 
AbstractCommandHandlerStatsSMTPResponse implements 
SMTPCommandHandlerStatsMBean, Disposable {
+public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats 
implements SMTPCommandHandlerStatsMBean, Disposable {
 
 private AtomicLong temp = new AtomicLong(0);
 private AtomicLong perm = new AtomicLong(0);
@@ -70,7 +71,7 @@ public class SMTPCommandHandlerStats ext
  * @see
  * 
org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats#incrementStats(org.apache.james.protocols.api.Response)
  */
-protected void incrementStats(SMTPResponse response) {
+protected void incrementStats(Response response) {
 try {
 String code = response.getRetCode();
 char c = code.charAt(0);



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228639 - in /james/server/trunk/smtpserver: ./ src/main/java/org/apache/james/smtpserver/ src/main/java/org/apache/james/smtpserver/fastfail/ src/test/java/org/apache/james/smtpserver/

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 15:51:03 2012
New Revision: 1228639

URL: http://svn.apache.org/viewvc?rev=1228639view=rev
Log:
Fix some more bugs which were introduced by JAMES-1360

Modified:
james/server/trunk/smtpserver/pom.xml

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java

james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java

Modified: james/server/trunk/smtpserver/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1228639r1=1228638r2=1228639view=diff
==
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Sat Jan  7 15:51:03 2012
@@ -203,6 +203,11 @@
 artifactIdslf4j-nop/artifactId
 scopetest/scope
 /dependency
+dependency
+groupIdcommons-codec/groupId
+artifactIdcommons-codec/artifactId
+scopetest/scope
+/dependency
 /dependencies
 
 build

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java?rev=1228639r1=1228638r2=1228639view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
 Sat Jan  7 15:51:03 2012
@@ -44,7 +44,7 @@ public class AddDefaultAttributesMessage
 
 final MailImpl mailImpl = (MailImpl) mail;
 mailImpl.setRemoteHost(session.getRemoteAddress().getHostName());
-
mailImpl.setRemoteAddr(session.getRemoteAddress().getAddress().toString());
+
mailImpl.setRemoteAddr(session.getRemoteAddress().getAddress().getHostAddress());
 if (session.getUser() != null) {
 mail.setAttribute(SMTP_AUTH_USER_ATTRIBUTE_NAME, 
session.getUser());
 }

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?rev=1228639r1=1228638r2=1228639view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
 Sat Jan  7 15:51:03 2012
@@ -70,7 +70,7 @@ public class POP3BeforeSMTPHandler imple
 }
 
 // Check if the ip is allowed to relay
-if (!session.isRelayingAllowed()  
POP3BeforeSMTPHelper.isAuthorized(session.getRemoteAddress().getAddress().toString()))
 {
+if (!session.isRelayingAllowed()  
POP3BeforeSMTPHelper.isAuthorized(session.getRemoteAddress().getAddress().getHostAddress()))
 {
 session.setRelayingAllowed(true);
 }
 return null;

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=1228639r1=1228638r2=1228639view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
 Sat Jan  7 15:51:03 2012
@@ -19,16 +19,28 @@
 
 package org.apache.james.smtpserver.fastfail;
 
+import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
+import

svn commit: r1228642 - /james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 16:07:01 2012
New Revision: 1228642

URL: http://svn.apache.org/viewvc?rev=1228642view=rev
Log:
Correctly convert MailAddress for recipients

Modified:

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1228642r1=1228641r2=1228642view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
 Sat Jan  7 16:07:01 2012
@@ -88,9 +88,14 @@ public class DataLineJamesMessageHookHan
 out.flush();
 out.close();
 
-List recipientCollection = (List) 
session.getState().get(SMTPSession.RCPT_LIST);
+ListMailAddress recipientCollection = (ListMailAddress) 
session.getState().get(SMTPSession.RCPT_LIST);
 MailAddress mailAddress = (MailAddress) 
session.getState().get(SMTPSession.SENDER);
-MailImpl mail = new MailImpl(MailImpl.getId(), new 
MailetMailAddressAdapter(mailAddress), recipientCollection);
+
+Listorg.apache.mailet.MailAddress rcpts = new 
ArrayListorg.apache.mailet.MailAddress();
+for (MailAddress address: recipientCollection) {
+rcpts.add(new MailetMailAddressAdapter(address));
+}
+MailImpl mail = new MailImpl(MailImpl.getId(), new 
MailetMailAddressAdapter(mailAddress), rcpts);
 
 // store mail in the session so we can be sure it get disposed
 // later



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228645 - /james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java

2012-01-07 Thread eric 
Author: eric
Date: Sat Jan  7 16:13:21 2012
New Revision: 1228645

URL: http://svn.apache.org/viewvc?rev=1228645view=rev
Log:
Fix some bug which introduced by JAMES-1360

Modified:

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1228645r1=1228644r2=1228645view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
 Sat Jan  7 16:13:21 2012
@@ -392,10 +392,10 @@ public class JDBCGreylistHandler extends
  *  org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
  */
 public HookResult doRcpt(SMTPSession session, MailAddress sender, 
MailAddress rcpt) {
-if ((wNetworks == null) || 
(!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().toString(
 {
+if ((wNetworks == null) || 
(!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().getHostAddress(
 {
 return super.doRcpt(session, sender, rcpt);
 } else {
-session.getLogger().info(IpAddress  + 
session.getRemoteAddress().getAddress().toString() +  is whitelisted. Skip 
greylisting.);
+session.getLogger().info(IpAddress  + 
session.getRemoteAddress().getAddress().getHostAddress() +  is whitelisted. 
Skip greylisting.);
 }
 return new HookResult(HookReturnCode.DECLINED);
 }



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228646 - /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java

2012-01-07 Thread eric 
Author: eric
Date: Sat Jan  7 16:14:54 2012
New Revision: 1228646

URL: http://svn.apache.org/viewvc?rev=1228646view=rev
Log:
Correctly import slf4jadapter

Modified:

james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java

Modified: 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java?rev=1228646r1=1228645r2=1228646view=diff
==
--- 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
 (original)
+++ 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
 Sat Jan  7 16:14:54 2012
@@ -34,7 +34,7 @@ import org.apache.james.imap.encode.base
 import org.apache.james.imap.main.ResponseEncoder;
 import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter;
 import org.apache.james.protocols.api.logger.ProtocolSessionLogger;
-import org.apache.james.protocols.api.logger.Slf4jLoggerAdapter;
+import org.apache.james.protocols.lib.Slf4jLoggerAdapter;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFutureListener;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228647 - /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java

2012-01-07 Thread eric 
Author: eric
Date: Sat Jan  7 16:15:10 2012
New Revision: 1228647

URL: http://svn.apache.org/viewvc?rev=1228647view=rev
Log:
Correctly import slf4jadapter

Modified:

james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java

Modified: 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java?rev=1228647r1=1228646r2=1228647view=diff
==
--- 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
 (original)
+++ 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
 Sat Jan  7 16:15:10 2012
@@ -29,7 +29,7 @@ import org.apache.james.imap.api.process
 import org.apache.james.imap.api.process.SelectedMailbox;
 import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter;
 import org.apache.james.protocols.api.logger.ProtocolSessionLogger;
-import org.apache.james.protocols.api.logger.Slf4jLoggerAdapter;
+import org.apache.james.protocols.lib.Slf4jLoggerAdapter;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.handler.codec.compression.ZlibDecoder;
 import org.jboss.netty.handler.codec.compression.ZlibEncoder;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228648 - /james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java

2012-01-07 Thread eric 
Author: eric
Date: Sat Jan  7 16:15:34 2012
New Revision: 1228648

URL: http://svn.apache.org/viewvc?rev=1228648view=rev
Log:
Correctly import slf4jadapter

Modified:

james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java

Modified: 
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java?rev=1228648r1=1228647r2=1228648view=diff
==
--- 
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
 (original)
+++ 
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
 Sat Jan  7 16:15:34 2012
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.MailboxE
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.protocols.api.logger.Slf4jLoggerAdapter;
+import org.apache.james.protocols.lib.Slf4jLoggerAdapter;
 import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook;
 import org.apache.james.protocols.smtp.MailAddress;
 import org.apache.james.protocols.smtp.MailEnvelope;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1228699 - in /james/server/trunk/smtpserver/src: main/java/org/apache/james/smtpserver/ main/java/org/apache/james/smtpserver/fastfail/ main/java/org/apache/james/smtpserver/netty/ test/j

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 19:09:05 2012
New Revision: 1228699

URL: http://svn.apache.org/viewvc?rev=1228699view=rev
Log:
Fix deprecated usage of procotols api.

Modified:

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java

james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java

james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java

james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java

james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java

james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java

james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1228699r1=1228698r2=1228699view=diff
==
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
 Sat Jan  7 19:09:05 2012
@@ -36,6 +36,7 @@ import org.apache.james.core.MimeMessage
 import org.apache.james.core.MimeMessageInputStream;
 import org.apache.james.core.MimeMessageInputStreamSource;
 import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.protocols.api.ProtocolSession.State;
 import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.ExtensibleHandler;
 import org.apache.james.protocols.api.handler.LineHandler;
@@ -77,7 +78,7 @@ public class DataLineJamesMessageHookHan
 byte[] line = new byte[lineByteBuffer.remaining()];
 lineByteBuffer.get(line, 0, line.length);
 
-MimeMessageInputStreamSource mmiss = (MimeMessageInputStreamSource) 
session.getState().get(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE);
+MimeMessageInputStreamSource mmiss = (MimeMessageInputStreamSource) 
session.getAttachment(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE, 
State.Transaction);
 
 try {
 OutputStream out = mmiss.getWritableOutputStream();
@@ -88,8 +89,8 @@ public class DataLineJamesMessageHookHan
 out.flush();
 out.close();
 
-ListMailAddress recipientCollection = (ListMailAddress) 
session.getState().get(SMTPSession.RCPT_LIST);
-MailAddress mailAddress = (MailAddress) 
session.getState().get(SMTPSession.SENDER);
+ListMailAddress recipientCollection = (ListMailAddress) 
session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction);
+MailAddress mailAddress = (MailAddress) 
session.getAttachment(SMTPSession.SENDER, State.Transaction);
 
 Listorg.apache.mailet.MailAddress rcpts = new 
ArrayListorg.apache.mailet.MailAddress();
 for (MailAddress address: recipientCollection) {
@@ -99,7 +100,7 @@ public class DataLineJamesMessageHookHan
 
 // store mail in the session so we can be sure it get disposed
 // later
-session.getState().put(SMTPConstants.MAIL, mail);
+session.setAttachment(SMTPConstants.MAIL, mail, 
State.Transaction);
 
 MimeMessageCopyOnWriteProxy mimeMessageCopyOnWriteProxy = null;
 try {
@@ -151,7 +152,7 @@ public class DataLineJamesMessageHookHan
 protected Response processExtensions(SMTPSession session, Mail mail) {
 if (mail != null  messageHandlers != null) {
 try {
-MimeMessageInputStreamSource mmiss = 
(MimeMessageInputStreamSource) 
session.getState().get(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE);
+MimeMessageInputStreamSource mmiss = 
(MimeMessageInputStreamSource) 
session.getAttachment(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE, 
State.Transaction);
 OutputStream out = null;
 try {
 out =

svn commit: r1228734 - in /james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core: AbstractHookableCmdHandler.java esmtp/AuthCmdHandler.java esmtp/EhloCmdHandler.java

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 21:56:02 2012
New Revision: 1228734

URL: http://svn.apache.org/viewvc?rev=1228734view=rev
Log:
Some cleanup

Modified:

james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.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

Modified: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java?rev=1228734r1=1228733r2=1228734view=diff
==
--- 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
 Sat Jan  7 21:56:02 2012
@@ -256,12 +256,12 @@ public abstract class AbstractHookableCm
  * @see 
org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
  *  java.util.List)
  */
-@SuppressWarnings({ unchecked, rawtypes })
-public void wireExtensions(Class interfaceName, List extension) {
+@SuppressWarnings(unchecked)
+   public void wireExtensions(Class? interfaceName, List? extension) {
 if (getHookInterface().equals(interfaceName)) {
-this.hooks = extension;
+this.hooks = (ListHook) extension;
 } else if (HookResultHook.class.equals(interfaceName)) {
-this.rHooks = extension;
+this.rHooks = (ListHookResultHook) extension;
 }
 
 }

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=1228734r1=1228733r2=1228734view=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
 Sat Jan  7 21:56:02 2012
@@ -496,16 +496,16 @@ public class AuthCmdHandler
 /**
  * @see 
org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
 java.util.List)
  */
-@SuppressWarnings({ unchecked, rawtypes })
-public void wireExtensions(Class interfaceName, List extension) throws 
WiringException {
+@SuppressWarnings(unchecked)
+   public void wireExtensions(Class? interfaceName, List? extension) 
throws WiringException {
 if (AuthHook.class.equals(interfaceName)) {
-this.hooks = extension;
+this.hooks = (ListAuthHook) extension;
 // If no AuthHook is configured then we revert to the default 
LocalUsersRespository check
 if (hooks == null || hooks.size() == 0) {
 throw new WiringException(AuthCmdHandler used without 
AuthHooks);
 }
 } else if (HookResultHook.class.equals(interfaceName)) {
-this.rHooks = extension;
+this.rHooks = (ListHookResultHook) extension;
 }
 }
 

Modified: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1228734r1=1228733r2=1228734view=diff
==
--- 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
 Sat Jan  7 21:56:02 2012
@@ -96,11 +96,11 @@ public class EhloCmdHandler extends Abst
  * @see 
org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
  *  java.util.List)
  */
-@SuppressWarnings({ unchecked, rawtypes })
-public void wireExtensions(Class interfaceName, List extension) {
+@SuppressWarnings(unchecked)
+   public void wireExtensions(Class? interfaceName, List? extension) {
 super.wireExtensions(interfaceName, extension);
 if (EhloExtension.class.equals(interfaceName)) {
-this.ehloExtensions = extension;
+this.ehloExtensions = (ListEhloExtension) extension;
 }
 }
 



-
To unsubscribe, e-mail:

svn commit: r1228736 - in /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core: CapaCapability.java CapaCmdHandler.java StlsCmdHandler.java TopCmdHandler.java UidlCmdHandler.

2012-01-07 Thread norman 
Author: norman
Date: Sat Jan  7 22:08:17 2012
New Revision: 1228736

URL: http://svn.apache.org/viewvc?rev=1228736view=rev
Log:
Use Set as return type of CapaCapability's method. See PROTOCOLS-84

Modified:

james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java

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/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/UserCmdHandler.java

Modified: 
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java?rev=1228736r1=1228735r2=1228736view=diff
==
--- 
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java
 (original)
+++ 
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java
 Sat Jan  7 22:08:17 2012
@@ -19,7 +19,7 @@
 
 package org.apache.james.protocols.pop3.core;
 
-import java.util.List;
+import java.util.Set;
 
 import org.apache.james.protocols.pop3.POP3Session;
 
@@ -37,5 +37,5 @@ public interface CapaCapability {
  * @param session
  * @return list
  */
-ListString getImplementedCapabilities(POP3Session session);
+SetString getImplementedCapabilities(POP3Session session);
 }

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=1228736r1=1228735r2=1228736view=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
 Sat Jan  7 22:08:17 2012
@@ -23,7 +23,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 
 import org.apache.james.protocols.api.Request;
@@ -40,7 +42,7 @@ import org.apache.james.protocols.pop3.P
 public class CapaCmdHandler implements CommandHandlerPOP3Session, 
ExtensibleHandler, CapaCapability {
 private ListCapaCapability caps;
 private static final CollectionString COMMANDS = 
Collections.unmodifiableCollection(Arrays.asList(CAPA));
-private static final ListString CAPS = 
Collections.unmodifiableList(Arrays.asList(PIPELINING));
+private static final SetString CAPS = Collections.unmodifiableSet(new 
HashSetString(Arrays.asList(PIPELINING)));
 
 /**
  * @see
@@ -51,9 +53,8 @@ public class CapaCmdHandler implements C
 POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, 
Capability list follows);
 
 for (int i = 0; i  caps.size(); i++) {
-ListString cList = 
caps.get(i).getImplementedCapabilities(session);
-for (int a = 0; a  cList.size(); a++) {
-response.appendLine(cList.get(a));
+for (String cap: caps.get(i).getImplementedCapabilities(session)) {
+response.appendLine(cap);
 }
 }
 response.appendLine(.);
@@ -74,10 +75,10 @@ public class CapaCmdHandler implements C
  * @see 
org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
  *  java.util.List)
  */
-@SuppressWarnings({ unchecked, rawtypes })
-public void wireExtensions(Class interfaceName, List extension) throws 
WiringException {
+@SuppressWarnings(unchecked)
+   public void wireExtensions(Class? interfaceName, List? extension) 
throws WiringException {
 if (interfaceName.equals(CapaCapability.class)) {
-caps = extension;
+caps = (ListCapaCapability) extension;
 }
 }
 
@@ -91,7 +92,7 @@ public class CapaCmdHandler implements C
 /**
  * @see 
org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
  */
-public ListString getImplementedCapabilities(POP3Session session) {
+public SetString getImplementedCapabilities(POP3Session session) {
 return CAPS;
 }
 

Modified: 
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java
URL:

[jira] [Created] (PROTOCOLS-84) CapaCapability.getImplementedCapabilities(..) should return a Set

2012-01-07 Thread Norman Maurer (Created) (JIRA) 
CapaCapability.getImplementedCapabilities(..) should return a Set
-

 Key: PROTOCOLS-84
 URL: https://issues.apache.org/jira/browse/PROTOCOLS-84
 Project: JAMES Protocols
  Issue Type: Task
  Components: pop3
Affects Versions: 1.6.0-RC1
Reporter: Norman Maurer
Assignee: Norman Maurer
 Fix For: 1.6.0




--
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-84) CapaCapability.getImplementedCapabilities(..) should return a Set

2012-01-07 Thread Norman Maurer (Resolved) (JIRA) 

 [ 
https://issues.apache.org/jira/browse/PROTOCOLS-84?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Norman Maurer resolved PROTOCOLS-84.


Resolution: Fixed

done

 CapaCapability.getImplementedCapabilities(..) should return a Set
 -

 Key: PROTOCOLS-84
 URL: https://issues.apache.org/jira/browse/PROTOCOLS-84
 Project: JAMES Protocols
  Issue Type: Task
  Components: pop3
Affects Versions: 1.6.0-RC1
Reporter: Norman Maurer
Assignee: Norman Maurer
 Fix For: 1.6.0




--
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