Author: eric
Date: Mon Sep 27 13:41:58 2010
New Revision: 1001735
URL: http://svn.apache.org/viewvc?rev=1001735&view=rev
Log:
Fix package import to deal with DNSService present in smtp-protocols
(JAMES-1050)
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.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/JDBCGreylistHandler.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/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/fastfail/ValidSenderDomainHandler.java
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java?rev=1001735&r1=1001734&r2=1001735&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
Mon Sep 27 13:41:58 2010
@@ -30,7 +30,6 @@ import org.apache.mailet.HostAddress;
public class SMTPServerDNSServiceAdapter implements DNSService{
private org.apache.james.dnsservice.api.DNSService dns;
-
public
SMTPServerDNSServiceAdapter(org.apache.james.dnsservice.api.DNSService dns) {
this.dns = dns;
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=1001735&r1=1001734&r2=1001735&view=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
Mon Sep 27 13:41:58 2010
@@ -79,7 +79,7 @@ public class DNSRBLHandler extends org.a
setGetDetail(handlerConfiguration.getBoolean("getDetail",false));
}
- @Resource(name="dnsserver")
+ @Resource(name="dnsservice")
public void setDNSService(DNSService dns) {
super.setDNSService(new SMTPServerDNSServiceAdapter(dns));
}
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=1001735&r1=1001734&r2=1001735&view=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
Mon Sep 27 13:41:58 2010
@@ -190,7 +190,7 @@ public class JDBCGreylistHandler extends
setUnseenLifeTime(TimeConverter.getMilliSeconds(unseenLifeTime));
}
- @Resource(name="dnsserver")
+ @Resource(name="dnsservice")
public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java?rev=1001735&r1=1001734&r2=1001735&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
Mon Sep 27 13:41:58 2010
@@ -26,7 +26,7 @@ import org.apache.james.smtpserver.SMTPS
public class ResolvableEhloHeloHandler extends
org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler {
- @Resource(name="dnsserver")
+ @Resource(name="dnsservice")
public void setDNSService(DNSService dns) {
super.setDNSService(new SMTPServerDNSServiceAdapter(dns));
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java?rev=1001735&r1=1001734&r2=1001735&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
Mon Sep 27 13:41:58 2010
@@ -26,7 +26,7 @@ import org.apache.james.smtpserver.SMTPS
public class ReverseEqualsEhloHeloHandler extends
org.apache.james.protocols.smtp.core.fastfail.ReverseEqualsEhloHeloHandler{
- @Resource(name="dnsserver")
+ @Resource(name="dnsservice")
public void setDNSService(DNSService dns) {
super.setDNSService(new SMTPServerDNSServiceAdapter(dns));
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=1001735&r1=1001734&r2=1001735&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
Mon Sep 27 13:41:58 2010
@@ -93,7 +93,7 @@ public class URIRBLHandler implements Lo
* Sets the DNS service.
* @param dnsService the dnsService to set
*/
- @Resource(name="dnsserver")
+ @Resource(name="dnsservice")
public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1001735&r1=1001734&r2=1001735&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
Mon Sep 27 13:41:58 2010
@@ -84,7 +84,7 @@ public class ValidRcptMX implements LogE
* Sets the DNS service.
* @param dnsService the dnsService to set
*/
- @Resource(name="dnsserver")
+ @Resource(name="dnsservice")
public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=1001735&r1=1001734&r2=1001735&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
Mon Sep 27 13:41:58 2010
@@ -26,8 +26,10 @@ import org.apache.james.dnsservice.api.D
import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ValidSenderDomainHandler extends
org.apache.james.protocols.smtp.core.fastfail.ValidSenderDomainHandler{
- @Resource(name="dnsserver")
+
+ @Resource(name="dnsservice")
public void setDNSService(DNSService dns) {
super.setDNSService(new SMTPServerDNSServiceAdapter(dns));
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
