svn commit: r421024 - in /james/server/trunk/src/java/org/apache/james/smtpserver: EhloCmdHandler.java HeloCmdHandler.java MailCmdHandler.java SendMailHandler.java

[berndf]

Author: berndf
Date: Tue Jul 11 16:28:26 2006
New Revision: 421024

URL: http://svn.apache.org/viewvc?rev=421024&view=rev
Log:
revert vetoed changes from rev 420948

Modified:
    james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
    james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
    james/server/trunk/src/java/org/apache/james/smtpserver/MailCmdHandler.java
    james/server/trunk/src/java/org/apache/james/smtpserver/SendMailHandler.java

Modified: 
james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java?rev=421024&r1=421023&r2=421024&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java 
(original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java 
Tue Jul 11 16:28:26 2006
@@ -76,7 +76,7 @@
      * @see 
org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
      */
     public void service(ServiceManager serviceMan) throws ServiceException {
-        setDNSServer((DNSServer) serviceMan.lookup(DNSServer.ROLE));
+        setDnsServer((DNSServer) serviceMan.lookup(DNSServer.ROLE));
     }
     
     /**
@@ -113,7 +113,7 @@
      * 
      * @param dnsServer The DNSServer
      */
-    public void setDNSServer(DNSServer dnsServer) {
+    public void setDnsServer(DNSServer dnsServer) {
         this.dnsServer = dnsServer;
     }
 

Modified: 
james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java?rev=421024&r1=421023&r2=421024&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java 
(original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java 
Tue Jul 11 16:28:26 2006
@@ -77,8 +77,7 @@
      * @see 
org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
      */
     public void service(ServiceManager serviceMan) throws ServiceException {
-        DNSServer dnsServer = (DNSServer) serviceMan.lookup(DNSServer.ROLE);
-        setDNSServer(dnsServer);
+        dnsServer = (DNSServer) serviceMan.lookup(DNSServer.ROLE);
     }
     
     /**
@@ -114,7 +113,7 @@
      * 
      * @param dnsServer The DNSServer
      */
-    public void setDNSServer(DNSServer dnsServer) {
+    public void setDnsServer(DNSServer dnsServer) {
         this.dnsServer = dnsServer;
     }
       

Modified: 
james/server/trunk/src/java/org/apache/james/smtpserver/MailCmdHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/MailCmdHandler.java?rev=421024&r1=421023&r2=421024&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/MailCmdHandler.java 
(original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/MailCmdHandler.java 
Tue Jul 11 16:28:26 2006
@@ -71,15 +71,15 @@
      * @see 
org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
      */
     public void service(ServiceManager serviceMan) throws ServiceException {
-        setDNSServer((DNSServer) serviceMan.lookup(DNSServer.ROLE));
+        setDnsServer((DNSServer) serviceMan.lookup(DNSServer.ROLE));
     }
     
     /**
-     * Set the DNSServer
+     * Set the DnsServer
      * 
-     * @param dnsServer The DNSServer
+     * @param dnsServer The DnsServer
      */
-    public void setDNSServer(DNSServer dnsServer) {
+    public void setDnsServer(DNSServer dnsServer) {
         this.dnsServer = dnsServer;
     }
     

Modified: 
james/server/trunk/src/java/org/apache/james/smtpserver/SendMailHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/SendMailHandler.java?rev=421024&r1=421023&r2=421024&view=diff
==============================================================================
--- 
james/server/trunk/src/java/org/apache/james/smtpserver/SendMailHandler.java 
(original)
+++ 
james/server/trunk/src/java/org/apache/james/smtpserver/SendMailHandler.java 
Tue Jul 11 16:28:26 2006
@@ -39,20 +39,16 @@
 
     private MailServer mailServer;
 
-    public void setMailServer(MailServer mailServer) {
-        this.mailServer = mailServer;
-    }
-
     /**
      * @see 
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager serviceManager) throws ServiceException 
{
-        setMailServer((MailServer) serviceManager.lookup(MailServer.ROLE));
+        mailServer = (MailServer) serviceManager.lookup(MailServer.ROLE);
     }
 
     /**
      * Adds header to the message
-     * @see org.apache.james.smtpserver.MessageHandler#onMessage(SMTPSession)
+     * @see org.apache.james.smtpserver#onMessage(SMTPSession)
      */
     public void onMessage(SMTPSession session) {
         getLogger().info("sending mail");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]