You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/10/09 12:38:45 UTC
svn commit: r1006129 - in /james/server/trunk:
core-library/src/test/java/org/apache/james/services/
fetchmail/src/main/java/org/apache/james/fetchmail/
lmtpserver/src/main/java/org/apache/james/lmtpserver/
lmtpserver/src/main/java/org/apache/james/lmt...
Author: norman
Date: Sat Oct 9 10:38:43 2010
New Revision: 1006129
URL: http://svn.apache.org/viewvc?rev=1006129&view=rev
Log:
Rename James.xml to mailserver.xml + rename James bean to mailserver
Added:
james/server/trunk/spring-deployment/src/main/config/james/mailserver.xml
- copied, changed from r1004708, james/server/trunk/spring-deployment/src/main/config/james/James.xml
Removed:
james/server/trunk/spring-deployment/src/main/config/james/James.xml
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
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/JamesMailCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java
james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java Sat Oct 9 10:38:43 2010
@@ -37,7 +37,7 @@ public class MockJSR250Loader extends Ab
// TODO Do we still need that?
// servicesByName.put(org.apache.james.LoaderService, this);
- mappings.put("James", org.apache.james.services.MailServer.class.getName());
+ mappings.put("mailserver", org.apache.james.services.MailServer.class.getName());
mappings.put("filesystem", org.apache.james.services.FileSystem.class.getName());
mappings.put("dnsservice", org.apache.james.dnsservice.api.DNSService.class.getName());
mappings.put("users-store", org.apache.james.api.user.UsersStore.class.getName());
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java Sat Oct 9 10:38:43 2010
@@ -663,7 +663,7 @@ public class FetchMail implements Runnab
}
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailserver) {
this.fieldServer = mailserver;
}
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java Sat Oct 9 10:38:43 2010
@@ -90,7 +90,7 @@ public class FetchScheduler implements F
}
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailserver) {
this.mailserver = mailserver;
}
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java Sat Oct 9 10:38:43 2010
@@ -60,7 +60,7 @@ public class DataLineLMTPMessageHookHand
* Sets the mail server.
* @param mailServer the mailServer to
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java Sat Oct 9 10:38:43 2010
@@ -48,7 +48,7 @@ public class NioLMTPServer extends Abstr
private String lmtpGreeting;
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java Sat Oct 9 10:38:43 2010
@@ -80,7 +80,7 @@ public class JamesMailetContext implemen
private HierarchicalConfiguration conf;
- @Resource(name = "James")
+ @Resource(name = "mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java Sat Oct 9 10:38:43 2010
@@ -239,7 +239,7 @@ public abstract class AbstractRedirect e
protected DNSService dns;
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java Sat Oct 9 10:38:43 2010
@@ -57,7 +57,7 @@ public abstract class AbstractVirtualUse
private MailServer mailServer;
private DNSService dns;
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java Sat Oct 9 10:38:43 2010
@@ -45,7 +45,7 @@ public abstract class AbstractVirtualUse
private MailServer mailServer;
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Sat Oct 9 10:38:43 2010
@@ -77,7 +77,7 @@ public class LocalDelivery extends Gener
this.usersStore = usersStore;
}
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Sat Oct 9 10:38:43 2010
@@ -203,7 +203,7 @@ public class RemoteDelivery extends Gene
this.dnsServer = dnsService;
}
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java Sat Oct 9 10:38:43 2010
@@ -47,7 +47,7 @@ public class SieveMailet extends SieveMa
private MailServer mailServer;
private MailboxManager mailboxManager;
- @Resource(name="James")
+ @Resource(name="mailserver")
public void setMailSerer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java Sat Oct 9 10:38:43 2010
@@ -59,7 +59,7 @@ public class NioPOP3Server extends Abstr
this.handlerChain = handlerChain;
}
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Sat Oct 9 10:38:43 2010
@@ -67,7 +67,7 @@ public class AddUserCmdHandler implement
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java Sat Oct 9 10:38:43 2010
@@ -60,7 +60,7 @@ public class ListUsersCmdHandler impleme
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java Sat Oct 9 10:38:43 2010
@@ -57,7 +57,7 @@ public class NioRemoteManager extends Ab
}
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java Sat Oct 9 10:38:43 2010
@@ -38,7 +38,7 @@ public class AuthRequiredToRelayRcptHook
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
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=1006129&r1=1006128&r2=1006129&view=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 Oct 9 10:38:43 2010
@@ -88,7 +88,7 @@ public final class DataLineJamesMessageH
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
@@ -335,4 +335,4 @@ public final class DataLineJamesMessageH
}
}
-}
\ No newline at end of file
+}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java Sat Oct 9 10:38:43 2010
@@ -51,7 +51,7 @@ public class JamesDataCmdHandler extends
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java Sat Oct 9 10:38:43 2010
@@ -39,7 +39,7 @@ public class JamesMailCmdHandler extends
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java Sat Oct 9 10:38:43 2010
@@ -42,7 +42,7 @@ public class JamesRcptCmdHandler extends
* @param mailServer
* the mailServer to set
*/
- @Resource(name = "James")
+ @Resource(name = "mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java Sat Oct 9 10:38:43 2010
@@ -54,7 +54,7 @@ public class SendMailHandler implements
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Sat Oct 9 10:38:43 2010
@@ -47,7 +47,7 @@ public class SenderAuthIdentifyVerificat
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Sat Oct 9 10:38:43 2010
@@ -92,7 +92,7 @@ public class ValidRcptHandler extends Ab
this.tableStore = tableStore;
}
- @Resource(name = "James")
+ @Resource(name = "mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java Sat Oct 9 10:38:43 2010
@@ -99,7 +99,7 @@ public class NioSMTPServer extends Abstr
private boolean verifyIdentity;
- @Resource(name="James")
+ @Resource(name="mailserver")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/log4j.properties?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/log4j.properties (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/log4j.properties Sat Oct 9 10:38:43 2010
@@ -38,11 +38,11 @@ log4j.appender.IMAPSERVER.DatePattern='.
log4j.appender.IMAPSERVER.layout=org.apache.log4j.PatternLayout
log4j.appender.IMAPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-log4j.appender.JAMES=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.JAMES.File=../log/james.log
-log4j.appender.JAMES.DatePattern='.'yyyy-MM-dd
-log4j.appender.JAMES.layout=org.apache.log4j.PatternLayout
-log4j.appender.JAMES.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+log4j.appender.MAILSERVER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.MAILSERVER.File=../log/mailserver.log
+log4j.appender.MAILSERVER.DatePattern='.'yyyy-MM-dd
+log4j.appender.MAILSERVER.layout=org.apache.log4j.PatternLayout
+log4j.appender.MAILSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
log4j.appender.MAILET=org.apache.log4j.DailyRollingFileAppender
log4j.appender.MAILET.File=../log/mailet.log
@@ -150,7 +150,7 @@ log4j.logger=DEBUG, CONS, FILE
log4j.logger.james.mailboxmanager=INFO, MAILBOXMANAGER
log4j.logger.james.imapserver=INFO, IMAPSERVER
-log4j.logger.james.James=INFO, JAMES
+log4j.logger.james.mailserver=INFO, MAILSERVER
log4j.logger.james.mailetcontext=INFO, MAILET
log4j.logger.james.spoolmanager=INFO, SPOOLMANAGER
log4j.logger.james.dnsserver=INFO, DNSSERVER
@@ -158,8 +158,6 @@ log4j.logger.james.remotemanager=INFO, R
log4j.logger.james.pop3server=INFO, POP3SERVER
log4j.logger.james.smtpserver=INFO, SMTPSERVER
log4j.logger.james.lmtpserver=INFO, LMTPSERVER
-log4j.logger.james.nntpserver=INFO, NNTPSERVER
-log4j.logger.james.nntp-repository=INFO, NNTP-REPOSITORY
log4j.logger.james.mailstore=INFO, MAILSTORE
log4j.logger.james.users-store=INFO, USERS-STORE
log4j.logger.james.objectstorage=INFO, OBJECTSTORAGE
Copied: james/server/trunk/spring-deployment/src/main/config/james/mailserver.xml (from r1004708, james/server/trunk/spring-deployment/src/main/config/james/James.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/mailserver.xml?p2=james/server/trunk/spring-deployment/src/main/config/james/mailserver.xml&p1=james/server/trunk/spring-deployment/src/main/config/james/James.xml&r1=1004708&r2=1006129&rev=1006129&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/James.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/mailserver.xml Sat Oct 9 10:38:43 2010
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<James>
+<mailserver>
<!-- CHECKME! -->
<!-- This is the postmaster email address for this mail server. -->
<!-- Set this to the appropriate email address for error reports -->
@@ -40,4 +40,4 @@
<!-- will use the specified value. -->
<!-- Set the default helloName which is used in all services if not overridden in the specific service-->
<helloName autodetect="true">myMailServer</helloName>
- </James>
\ No newline at end of file
+</mailserver>
\ No newline at end of file
Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=1006129&r1=1006128&r2=1006129&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Sat Oct 9 10:38:43 2010
@@ -42,7 +42,6 @@
<props>
<prop key="fetchmail"> bean:name=fetchmail</prop>
<prop key="smtpserver">bean:name=smtpserver</prop>
- <prop key="James" >bean:name=James</prop>
<prop key="dnsservice" >bean:name=dnsservice</prop>
<prop key="remotemanager" >bean:name=remotemanager</prop>
<prop key="pop3server" >bean:name=pop3server</prop>
@@ -77,13 +76,12 @@
<bean id="configurationProvider" class="org.apache.james.container.spring.lifecycle.SpringConfigurationProvider">
<property name="configurationMappings">
<map>
- <entry key="mailetcontext" value="James"/>
+ <entry key="mailetcontext" value="mailserver"/>
<entry key="lmtpProtocolHandlerChain" value="lmtpserver"/>
<entry key="smtpProtocolHandlerChain" value="smtpserver"/>
<entry key="pop3ProtocolHandlerChain" value="pop3server"/>
<entry key="remoteProtocolHandlerChain" value="remotemanager"/>
<entry key="mailProcessor" value="spoolmanager"/>
- <entry key="mailserver" value="James"/>
</map>
</property>
</bean>
@@ -110,7 +108,6 @@
<entry key="pop3ProtocolHandlerChain" value="pop3server"/>
<entry key="remoteProtocolHandlerChain" value="remoteManager"/>
<entry key="mailProcessor" value="spoolmanager"/>
- <entry key="mailserver" value="James"/>
</map>
</property>
</bean>
@@ -178,7 +175,7 @@
<!-- mailserver implementation which use activemq for spooling the mail -->
- <bean id="mailserver" name="James" class="org.apache.james.JamesMailServer"/>
+ <bean id="mailserver" class="org.apache.james.JamesMailServer"/>
<bean id="mailetcontext" class="org.apache.james.mailetcontainer.JamesMailetContext"/>
@@ -441,4 +438,4 @@
</bean>
<!-- #################################################################### -->
-</beans>
\ No newline at end of file
+</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org