Author: eric
Date: Wed Apr 6 15:35:34 2011
New Revision: 1089496
URL: http://svn.apache.org/viewvc?rev=1089496&view=rev
Log:
Rename spring bean definition from virtualusertable to recipientrewritetable
(JAMES-1218)
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.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=1089496&r1=1089495&r2=1089496&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
Wed Apr 6 15:35:34 2011
@@ -65,10 +65,10 @@
<!-- no alias needed -->
<value></value>
</entry>
- <!-- Virtual User Table-->
+ <!-- Recipient Rewrite Table-->
<entry>
<key>
- <value>virtualusertable</value>
+ <value>recipientrewritetable</value>
</key>
<!-- no alias needed -->
<value></value>
@@ -378,7 +378,7 @@
<entry key="org.apache.james:type=server,name=imapserver"
value-ref="imapserver"/>
<entry key="org.apache.james:type=component,name=domainlist"
value-ref="domainlistmanagement"/>
<entry key="org.apache.james:type=component,name=dnsservice"
value-ref="dnsservice"/>
- <entry key="org.apache.james:type=component,name=virtualusertable"
value-ref="virtualusertablemanagement"/>
+ <entry
key="org.apache.james:type=component,name=recipientrewritetable"
value-ref="recipientrewritetablemanagement"/>
<entry key="org.apache.james:type=component,name=usersrepository"
value-ref="usersrepositorymanagement"/>
<entry key="org.apache.james:type=component,name=fetchmail"
value-ref="fetchmail"/>
<entry key="org.apache.james:type=component,name=mailboxmanagement"
value-ref="mailboxmanagermanagement"/>
@@ -390,12 +390,12 @@
</property>
<property name="assembler">
<bean
class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces"
value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UsersRepositoryManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean,org.apache.james.container.spring.provider.log.LogProviderManagementMBean"/>
+ <property name="managedInterfaces"
value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.rrt.api.RecipientRewriteTableManagementMBean,org.apache.james.user.api.UsersRepositoryManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean,org.apache.james.container.spring.provider.log.LogProviderManagementMBean"/>
</bean>
</property>
</bean>
<bean id="usersrepositorymanagement"
class="org.apache.james.user.lib.UsersRepositoryManagement" />
- <bean id="virtualusertablemanagement"
class="org.apache.james.vut.lib.VirtualUserTableManagement" />
+ <bean id="recipientrewritetablemanagement"
class="org.apache.james.rrt.lib.RecipientRewriteTableManagement" />
<bean id="domainlistmanagement"
class="org.apache.james.domainlist.lib.DomainListManagement" />
<bean id="mailboxmanagermanagement"
class="org.apache.james.adapter.mailbox.MailboxManagerManagement" />
<bean id="mailboxcopiermanagement"
class="org.apache.james.container.spring.mailbox.MailboxCopierManagement" />
Modified:
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java?rev=1089496&r1=1089495&r2=1089496&view=diff
==============================================================================
---
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
(original)
+++
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
Wed Apr 6 15:35:34 2011
@@ -41,7 +41,7 @@ public class RecipientRewriteTableManage
private RecipientRewriteTable vut;
- @Resource(name = "virtualusertable")
+ @Resource(name = "recipientrewritetable")
public void setManageableVirtualUserTable(RecipientRewriteTable vut) {
this.vut = vut;
}
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java?rev=1089496&r1=1089495&r2=1089496&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
Wed Apr 6 15:35:34 2011
@@ -43,7 +43,7 @@ public class VirtualUserTable extends Ab
* @param vutStore
* the vutStore to set, possibly null
*/
- @Resource(name = "virtualusertable")
+ @Resource(name = "recipientrewritetable")
public final void
setVirtualUserTable(org.apache.james.rrt.api.RecipientRewriteTable vut) {
this.vut = vut;
}
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java?rev=1089496&r1=1089495&r2=1089496&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
Wed Apr 6 15:35:34 2011
@@ -59,7 +59,7 @@ public class RecipientRewriteTableTest e
};
FakeMailetConfig mockMailetConfig = new FakeMailetConfig("vut",
mockMailetContext, new Properties());
- // mockMailetConfig.put("virtualusertable", "vut");
+ // mockMailetConfig.put("recipientrewritetable", "vut");
table.setVirtualUserTable(new
org.apache.james.rrt.api.RecipientRewriteTable() {
public Collection<String> getMappings(String user, String domain)
throws ErrorMappingException, RecipientRewriteTableException {
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=1089496&r1=1089495&r2=1089496&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
Wed Apr 6 15:35:34 2011
@@ -76,7 +76,7 @@ public class ValidRcptHandler extends Ab
* @param tableStore
* the tableStore to set
*/
- @Resource(name = "virtualusertable")
+ @Resource(name = "recipientrewritetable")
public final void setVirtualUserTable(RecipientRewriteTable vut) {
this.vut = vut;
}
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=1089496&r1=1089495&r2=1089496&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
Wed Apr 6 15:35:34 2011
@@ -300,7 +300,7 @@ public abstract class SMTPServerTest ext
m_serviceManager.put("filesystem", fileSystem);
m_serviceManager.put("org.apache.james.smtpserver.protocol.DNSService",
dnsAdapter);
- m_serviceManager.put("virtualusertable", new RecipientRewriteTable() {
+ m_serviceManager.put("recipientrewritetable", new
RecipientRewriteTable() {
public void addRegexMapping(String user, String domain, String
regex) throws RecipientRewriteTableException {
throw new UnsupportedOperationException("Not implemented");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
