Author: norman
Date: Sat Jan 1 10:45:24 2011
New Revision: 1054222
URL: http://svn.apache.org/viewvc?rev=1054222&view=rev
Log:
Rename mailQueueFactory to mailqueuefactory when using @Resource annotations
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/container-spring/src/main/config/james/log4j.properties
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1054222&r1=1054221&r2=1054222&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
Sat Jan 1 10:45:24 2011
@@ -130,7 +130,7 @@
<!--
James Mail Queue Factory
-->
- <bean id="mailQueueFactory"
class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory"
depends-on="broker"/>
+ <bean id="mailqueuefactory"
class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory"
depends-on="broker"/>
<!--
ActiveMQ Broker, Connections, Blob
Modified:
james/server/trunk/container-spring/src/main/config/james/log4j.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/log4j.properties?rev=1054222&r1=1054221&r2=1054222&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/log4j.properties
(original)
+++ james/server/trunk/container-spring/src/main/config/james/log4j.properties
Sat Jan 1 10:45:24 2011
@@ -100,6 +100,12 @@ log4j.appender.VIRTUALUSERTABLE.DatePatt
log4j.appender.VIRTUALUSERTABLE.layout=org.apache.log4j.PatternLayout
log4j.appender.VIRTUALUSERTABLE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS}
| %c | %m%n
+log4j.appender.MAILQUEUEFACTORY=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.MAILQUEUEFACTORY.File=../log/mailqueuefactory.log
+log4j.appender.MAILQUEUEFACTORY.DatePattern='.'yyyy-MM-dd
+log4j.appender.MAILQUEUEFACTORY.layout=org.apache.log4j.PatternLayout
+log4j.appender.MAILQUEUEFACTORY.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS}
| %c | %m%n
+
log4j.logger.org.apache.jackrabbit=ERROR, CONS, FILE
log4j.logger.org.apache.xbean.spring=WARN, CONS, FILE
@@ -124,3 +130,5 @@ log4j.logger.james.usersrepository=INFO,
log4j.logger.james.fetchmail=INFO, FETCHMAIL
log4j.logger.james.domainlist=INFO, DOMAINLIST
log4j.logger.james.virtualusertable=INFO, VIRTUALUSERTABLE
+log4j.logger.james.mailqueuefactory=INFO, MAILQUEUEFACTORY
+
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=1054222&r1=1054221&r2=1054222&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 Jan 1 10:45:24 2011
@@ -88,7 +88,7 @@ public class FetchScheduler implements F
- @Resource(name="mailQueueFactory")
+ @Resource(name="mailqueuefactory")
public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
Modified:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java?rev=1054222&r1=1054221&r2=1054222&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
Sat Jan 1 10:45:24 2011
@@ -91,7 +91,7 @@ public class JamesMailSpooler implements
private MailQueueFactory queueFactory;
- @Resource(name="mailQueueFactory")
+ @Resource(name="mailqueuefactory")
public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
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=1054222&r1=1054221&r2=1054222&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 Jan 1 10:45:24 2011
@@ -194,7 +194,7 @@ public class RemoteDelivery extends Gene
- @Resource(name="mailQueueFactory")
+ @Resource(name="mailqueuefactory")
public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
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=1054222&r1=1054221&r2=1054222&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 Jan 1 10:45:24 2011
@@ -47,7 +47,7 @@ public class SendMailHandler implements
- @Resource(name="mailQueueFactory")
+ @Resource(name="mailqueuefactory")
public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1054222&r1=1054221&r2=1054222&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Sat Jan 1 10:45:24 2011
@@ -368,7 +368,7 @@ public abstract class SMTPServerTest ext
m_serviceManager.put("org.apache.james.smtpserver.protocol.DNSService",
dnsAdapter);
queueFactory = new MockMailQueueFactory();
queue = (MockMailQueue)
queueFactory.getQueue(MockMailQueueFactory.SPOOL);
- m_serviceManager.put("mailQueueFactory", queueFactory);
+ m_serviceManager.put("mailqueuefactory", queueFactory);
m_serviceManager.put("domainlist", new SimpleDomainList() {
public boolean containsDomain(String serverName) {
return "localhost".equals(serverName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
