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 er...@apache.org on 2011/04/06 17:44:06 UTC

svn commit: r1089500 - in /james/server/trunk: container-spring/src/main/config/examples/ container-spring/src/main/config/examples/META-INF/ container-spring/src/main/config/james/ container-spring/src/main/config/james/META-INF/ jdbc/src/test/resourc...

Author: eric
Date: Wed Apr  6 15:44:05 2011
New Revision: 1089500

URL: http://svn.apache.org/viewvc?rev=1089500&view=rev
Log:
Update the XML content to reflect class/package naming change (JAMES-1218)

Modified:
    james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml
    james/server/trunk/container-spring/src/main/config/examples/mailetcontainer.xml
    james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml
    james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml
    james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml
    james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml
    james/server/trunk/container-spring/src/main/config/james/sqlResources.xml
    james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml
    james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml
    james/server/trunk/jdbc/src/test/resources/sqlResources.xml
    james/server/trunk/jpa/pom.xml
    james/server/trunk/src/site/xdoc/dev-provided-mailets.xml
    james/server/trunk/src/site/xdoc/release-notes.xml

Modified: james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml (original)
+++ james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml Wed Apr  6 15:44:05 2011
@@ -53,8 +53,8 @@
         <!-- User-->
         <class>org.apache.james.user.jpa.model.JPAUser</class>
 
-        <!-- VirtualUser -->
-        <class>org.apache.james.vut.jpa.model.JPAVirtualUser</class>
+        <!-- RecipientRewrite -->
+        <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
 
         <properties>
             <!--  Create tables on startup -->

Modified: james/server/trunk/container-spring/src/main/config/examples/mailetcontainer.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/mailetcontainer.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/mailetcontainer.xml (original)
+++ james/server/trunk/container-spring/src/main/config/examples/mailetcontainer.xml Wed Apr  6 15:44:05 2011
@@ -38,7 +38,7 @@
          <!-- This mailet redirects mail for the user 'postmaster' at any local domain to -->
          <!-- the postmaster address specified for the server. The postmaster address -->
          <!-- is required by rfc822. Do not remove this mailet unless you are meeting -->
-         <!-- this requirement through other means (e.g. a XML/JDBCVirtualUserTable defined in virtualusertable-store.xml) -->
+         <!-- this requirement through other means (e.g. a XML/JDBCRecipientRewriteTable defined in virtualusertable-store.xml) -->
          <mailet match="All" class="PostmasterAlias"/>
 
          <!-- Checks that the email Sender is associated with a valid domain. -->
@@ -186,9 +186,9 @@ Regards, Postmaster XXX.YYY
 
          <!--
          
-         XMLVirtualUserTable is deprecated - Use the definitions in virtualusertable-store.xml
+         XMLRecipientRewriteTable is deprecated - Use the definitions in virtualusertable-store.xml
          
-         <mailet match="All" class="XMLVirtualUserTable">
+         <mailet match="All" class="XMLRecipientRewriteTable">
             <!- 1:1 mapping ->
             <mapping>morgoth@middle-earth=sauron@mordor</mapping>
             <!- 1:n mapping ->
@@ -402,9 +402,9 @@ Regards, Postmaster XXX.YYY
          </mailet>
          -->
 
-         <!--  The VirtualUserTable will use the definitions found in virtualusertable-store.xml -->
-         <mailet match="All" class="VirtualUserTable">
-             <virtualusertable>DefaultVirtualUserTable</virtualusertable>
+         <!--  The RecipientRewriteTable will use the definitions found in virtualusertable-store.xml -->
+         <mailet match="All" class="RecipientRewriteTable">
+             <virtualusertable>DefaultRecipientRewriteTable</virtualusertable>
          </mailet>
 
          <!-- Is the recipient is for a local account, deliver it locally -->

Modified: james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml (original)
+++ james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml Wed Apr  6 15:44:05 2011
@@ -893,28 +893,28 @@
     </sql>
 </sqlDefs>
 
-<!-- SQL statements for the JdbcVirtualUserTable  -->
-<sqlDefs name="org.apache.james.vut.jdbc.JDBCVirtualUserTable">
+<!-- SQL statements for the JdbcRecipientRewriteTable  -->
+<sqlDefs name="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable">
 
     <!-- Statements used to check whether a particular message exists in this repository. -->
-    <sql name="selectMappings" db="derby">select VirtualUserTable.target_address,(VirtualUserTable."user" || '@' ||VirtualUserTable.domain) from VirtualUserTable, VirtualUserTable as VUTDomains where ((VirtualUserTable."user") like ? or (VirtualUserTable."user") = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by 2 desc</sql>
-    <sql name="selectMappings">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1</sql>
-    <sql name="selectMappings" db="postgresql">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by (VirtualUserTable.user || '@' || VirtualUserTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="derby">select RecipientRewriteTable.target_address,(RecipientRewriteTable."user" || '@' ||RecipientRewriteTable.domain) from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where ((RecipientRewriteTable."user") like ? or (RecipientRewriteTable."user") = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by 2 desc</sql>
+    <sql name="selectMappings">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="postgresql">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by (RecipientRewriteTable.user || '@' || RecipientRewriteTable.domain) desc limit 1</sql>
     
-    <sql name="selectUserDomainMapping" db="derby">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
-    <sql name="selectUserDomainMapping">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable.user = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping" db="derby">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable.user = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="deleteMapping">delete from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? and VirtualUserTable.target_address = ?</sql>
+    <sql name="deleteMapping">delete from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? and RecipientRewriteTable.target_address = ?</sql>
    
-    <sql name="updateMapping">update VirtualUserTable set VirtualUserTable.target_address = ? where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="updateMapping">update RecipientRewriteTable set RecipientRewriteTable.target_address = ? where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="addMapping">insert into VirtualUserTable values(?,?,?) </sql>
+    <sql name="addMapping">insert into RecipientRewriteTable values(?,?,?) </sql>
     
-    <sql name="selectAllMappings">select * from VirtualUserTable </sql>
+    <sql name="selectAllMappings">select * from RecipientRewriteTable </sql>
     
     <!-- Statements used to create the table associated with this class. -->
     <sql name="createTable" db="mysql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -924,7 +924,7 @@
     <!-- TEMPORARY DISABLED -->
     <!--
     <sql name="createTable" db="hypersonic">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -932,7 +932,7 @@
         )
     </sql>
     <sql name="createTable" db="hsqldb">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -940,7 +940,7 @@
         )
     </sql>
     <sql name="createTable" db="mssql">
-        CREATE TABLE [VirtualUserTable] (
+        CREATE TABLE [RecipientRewriteTable] (
             [user] [varchar] (64) NOT NULL default '',
             [domain] [varchar] (255) NOT NULL default '',
             [target_address] [varchar] (255) NOT NULL default '',
@@ -948,7 +948,7 @@
         )
     </sql>
     <sql name="createTable" db="oracle">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar2(64) NOT NULL default '',
             domain varchar2(255) NOT NULL default '',
             target_address varchar2(255) NOT NULL default '',
@@ -956,7 +956,7 @@
         )
     </sql>
     <sql name="createTable" db="sapdb">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -964,7 +964,7 @@
         )
     </sql>
     <sql name="createTable" db="db2">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -972,7 +972,7 @@
         )
     </sql>
     <sql name="createTable" db="ingres">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -981,7 +981,7 @@
     </sql>
     -->
     <sql name="createTable" db="postgresql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -989,7 +989,7 @@
         )
     </sql>
     <sql name="createTable" db="derby">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar (64) NOT NULL default '',
             domain varchar (255) NOT NULL default '',
             target_address varchar (255) NOT NULL default '',

Modified: james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml (original)
+++ james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml Wed Apr  6 15:44:05 2011
@@ -24,7 +24,7 @@
 <!-- By setting the mappingLimit you can specify how much mapping will get processed -->
 <!-- before a bounce will send. This avoid infinity loops. Default 10.  -->
 <!--
-<virtualusertable  class="org.apache.james.vut.xml.XMLVirtualUserTable">
+<virtualusertable  class="org.apache.james.rrt.xml.XMLRecipientRewriteTable">
     <recursiveMapping> true </recursiveMapping>
     <mappingLimit> 10 </mappingLimit>
     
@@ -32,19 +32,19 @@
 </virtualusertable>
 -->
 
-<!-- Database backed VirtualUsertable -->
+<!-- Database backed RecipientRewritetable -->
 <!-- -->
-<!-- Use these configurations to store the VirtualUserTable in a database. -->
+<!-- Use these configurations to store the RecipientRewriteTable in a database. -->
 <!-- 
-<virtualusertable class="org.apache.james.vut.jdbc.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
+<virtualusertable class="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable" destinationURL="db://maildb/RecipientRewriteTable">
     <recursiveMapping> true </recursiveMapping>
     <mappingLimit> 10 </mappingLimit>
     <sqlFile>file://conf/sqlResources.xml</sqlFile>
 </virtualusertable>
 -->
     
-<!-- The default table for storing James' VirtualUserTable mappings. -->
-<virtualusertable class="org.apache.james.vut.jpa.JPAVirtualUserTable">
+<!-- The default table for storing James' RecipientRewriteTable mappings. -->
+<virtualusertable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
     <recursiveMapping> true </recursiveMapping>
     <mappingLimit> 10 </mappingLimit>
 </virtualusertable>

Modified: james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml Wed Apr  6 15:44:05 2011
@@ -35,7 +35,7 @@
         <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
         <class>org.apache.james.domainlist.jpa.model.JPADomain</class>
         <class>org.apache.james.user.jpa.model.JPAUser</class>
-        <class>org.apache.james.vut.jpa.model.JPAVirtualUser</class>
+        <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
         <properties>
             <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
             <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/>

Modified: james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml Wed Apr  6 15:44:05 2011
@@ -51,8 +51,8 @@
         <name>X-UserIsAuth</name>
         <value>true</value>
       </mailet>
-      <mailet match="All" class="VirtualUserTable">
-        <virtualusertable>DefaultVirtualUserTable</virtualusertable>
+      <mailet match="All" class="RecipientRewriteTable">
+        <virtualusertable>DefaultRecipientRewriteTable</virtualusertable>
       </mailet>
       <mailet match="RecipientIsLocal" class="LocalDelivery"/>
       <mailet match="HostIsLocal" class="ToProcessor">

Modified: james/server/trunk/container-spring/src/main/config/james/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/sqlResources.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/sqlResources.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/sqlResources.xml Wed Apr  6 15:44:05 2011
@@ -825,27 +825,27 @@
     </sql>
 </sqlDefs>
 
-<sqlDefs name="org.apache.james.vut.jdbc.JDBCVirtualUserTable">
+<sqlDefs name="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable">
 
     <!-- Statements used to check whether a particular message exists in this repository. -->
-    <sql name="selectMappings" db="derby">select VirtualUserTable.target_address,(VirtualUserTable."user" || '@' ||VirtualUserTable.domain) from VirtualUserTable, VirtualUserTable as VUTDomains where ((VirtualUserTable."user") like ? or (VirtualUserTable."user") = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by 2 desc</sql>
-    <sql name="selectMappings">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1</sql>
-    <sql name="selectMappings" db="postgresql">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by (VirtualUserTable.user || '@' || VirtualUserTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="derby">select RecipientRewriteTable.target_address,(RecipientRewriteTable."user" || '@' ||RecipientRewriteTable.domain) from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where ((RecipientRewriteTable."user") like ? or (RecipientRewriteTable."user") = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by 2 desc</sql>
+    <sql name="selectMappings">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="postgresql">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by (RecipientRewriteTable.user || '@' || RecipientRewriteTable.domain) desc limit 1</sql>
     
-    <sql name="selectUserDomainMapping" db="derby">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
-    <sql name="selectUserDomainMapping">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable.user = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping" db="derby">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable.user = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="deleteMapping">delete from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? and VirtualUserTable.target_address = ?</sql>
+    <sql name="deleteMapping">delete from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? and RecipientRewriteTable.target_address = ?</sql>
    
-    <sql name="updateMapping">update VirtualUserTable set VirtualUserTable.target_address = ? where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="updateMapping">update RecipientRewriteTable set RecipientRewriteTable.target_address = ? where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="addMapping">insert into VirtualUserTable values(?,?,?) </sql>
+    <sql name="addMapping">insert into RecipientRewriteTable values(?,?,?) </sql>
     
-    <sql name="selectAllMappings">select * from VirtualUserTable </sql>
+    <sql name="selectAllMappings">select * from RecipientRewriteTable </sql>
     
     <!-- Statements used to create the table associated with this class. -->
     <sql name="createTable" db="mysql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -855,7 +855,7 @@
     <!-- TEMPORARY DISABLED -->
     <!--
     <sql name="createTable" db="hypersonic">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -863,7 +863,7 @@
         )
     </sql>
     <sql name="createTable" db="hsqldb">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -871,7 +871,7 @@
         )
     </sql>
     <sql name="createTable" db="mssql">
-        CREATE TABLE [VirtualUserTable] (
+        CREATE TABLE [RecipientRewriteTable] (
             [user] [varchar] (64) NOT NULL default '',
             [domain] [varchar] (255) NOT NULL default '',
             [target_address] [varchar] (255) NOT NULL default '',
@@ -879,7 +879,7 @@
         )
     </sql>
     <sql name="createTable" db="oracle">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar2(64) NOT NULL default '',
             domain varchar2(255) NOT NULL default '',
             target_address varchar2(255) NOT NULL default '',
@@ -887,7 +887,7 @@
         )
     </sql>
     <sql name="createTable" db="sapdb">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -895,7 +895,7 @@
         )
     </sql>
     <sql name="createTable" db="db2">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -903,7 +903,7 @@
         )
     </sql>
     <sql name="createTable" db="ingres">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -912,7 +912,7 @@
     </sql>
     -->
     <sql name="createTable" db="postgresql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -920,7 +920,7 @@
         )
     </sql>
     <sql name="createTable" db="derby">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar (64) NOT NULL default '',
             domain varchar (255) NOT NULL default '',
             target_address varchar (255) NOT NULL default '',

Modified: james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml Wed Apr  6 15:44:05 2011
@@ -19,7 +19,7 @@
  -->
 
 <!-- See http://james.apache.org/server/3/config.html for usage -->
-<virtualusertable class="org.apache.james.vut.jpa.JPAVirtualUserTable">
+<virtualusertable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
   <recursiveMapping> true </recursiveMapping>
   <mappingLimit> 10 </mappingLimit>
 </virtualusertable>

Modified: james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml (original)
+++ james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml Wed Apr  6 15:44:05 2011
@@ -1024,31 +1024,31 @@
     </sql>
 </sqlDefs>
 
-<!-- SQL statements for the JdbcVirtualUserTable  -->
-<sqlDefs name="org.apache.james.vut.jdbc.JDBCVirtualUserTable">
+<!-- SQL statements for the JdbcRecipientRewriteTable  -->
+<sqlDefs name="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable">
 
     <!-- Statements used to check whether a particular message exists in this repository. -->
-    <sql name="selectMappings" db="derby">select VirtualUserTable.target_address,(VirtualUserTable."user" || '@' ||VirtualUserTable.domain) from VirtualUserTable, VirtualUserTable as VUTDomains where ((VirtualUserTable."user") like ? or (VirtualUserTable."user") like '\%' escape '\') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '\%' escape '\' and VUTDomains.domain like ?)) order by 2 desc</sql>
-    <sql name="selectMappings">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user like '\%') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '\%' and VUTDomains.domain like ?)) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="derby">select RecipientRewriteTable.target_address,(RecipientRewriteTable."user" || '@' ||RecipientRewriteTable.domain) from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where ((RecipientRewriteTable."user") like ? or (RecipientRewriteTable."user") like '\%' escape '\') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain like '\%' escape '\' and VUTDomains.domain like ?)) order by 2 desc</sql>
+    <sql name="selectMappings">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user like '\%') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain like '\%' and VUTDomains.domain like ?)) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1</sql>
     
-    <sql name="selectUserDomainMapping" db="derby">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
-    <sql name="selectUserDomainMapping">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable.user = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping" db="derby">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable.user = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="deleteMapping">delete from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? and VirtualUserTable.target_address = ?</sql>
+    <sql name="deleteMapping">delete from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? and RecipientRewriteTable.target_address = ?</sql>
    
-    <sql name="updateMapping">update VirtualUserTable set VirtualUserTable.target_address = ? where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="updateMapping">update RecipientRewriteTable set RecipientRewriteTable.target_address = ? where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="addMapping">insert into VirtualUserTable values(?,?,?) </sql>
+    <sql name="addMapping">insert into RecipientRewriteTable values(?,?,?) </sql>
     
-    <sql name="selectAllMappings">select * from VirtualUserTable </sql>
+    <sql name="selectAllMappings">select * from RecipientRewriteTable </sql>
     
-    <sql name="selectDomains">select distinct domain from VirtualUserTable</sql>
+    <sql name="selectDomains">select distinct domain from RecipientRewriteTable</sql>
     
-    <sql name="selectDomain">select distinct domain from VirtualUserTable where domain = ? </sql>
+    <sql name="selectDomain">select distinct domain from RecipientRewriteTable where domain = ? </sql>
     
     <!-- Statements used to create the table associated with this class. -->
     <sql name="createTable" db="mysql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1058,7 +1058,7 @@
     <!-- TEMPORARY DISABLED -->
     <!--
     <sql name="createTable" db="hypersonic">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1066,7 +1066,7 @@
         )
     </sql>
     <sql name="createTable" db="hsqldb">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1074,7 +1074,7 @@
         )
     </sql>
     <sql name="createTable" db="mssql">
-        CREATE TABLE [VirtualUserTable] (
+        CREATE TABLE [RecipientRewriteTable] (
             [user] [varchar] (64) NOT NULL default '',
             [domain] [varchar] (255) NOT NULL default '',
             [target_address] [varchar] (255) NOT NULL default '',
@@ -1082,7 +1082,7 @@
         )
     </sql>
     <sql name="createTable" db="oracle">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar2(64) NOT NULL default '',
             domain varchar2(255) NOT NULL default '',
             target_address varchar2(255) NOT NULL default '',
@@ -1090,7 +1090,7 @@
         )
     </sql>
     <sql name="createTable" db="sapdb">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1098,7 +1098,7 @@
         )
     </sql>
     <sql name="createTable" db="db2">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1106,7 +1106,7 @@
         )
     </sql>
     <sql name="createTable" db="ingres">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1115,7 +1115,7 @@
     </sql>
     -->
     <sql name="createTable" db="postgresql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -1123,7 +1123,7 @@
         )
     </sql>
     <sql name="createTable" db="derby">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar (64) NOT NULL default '',
             domain varchar (255) NOT NULL default '',
             target_address varchar (255) NOT NULL default '',

Modified: james/server/trunk/jdbc/src/test/resources/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/src/test/resources/sqlResources.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/jdbc/src/test/resources/sqlResources.xml (original)
+++ james/server/trunk/jdbc/src/test/resources/sqlResources.xml Wed Apr  6 15:44:05 2011
@@ -893,32 +893,32 @@
     </sql>
 </sqlDefs>
 
-<!-- SQL statements for the JdbcVirtualUserTable  -->
-<sqlDefs name="org.apache.james.vut.jdbc.JDBCVirtualUserTable">
+<!-- SQL statements for the JdbcRecipientRewriteTable  -->
+<sqlDefs name="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable">
 
     <!-- Statements used to check whether a particular message exists in this repository. -->
-    <sql name="selectMappings" db="derby">select VirtualUserTable.target_address,(VirtualUserTable."user" || '@' ||VirtualUserTable.domain) from VirtualUserTable, VirtualUserTable as VUTDomains where ((VirtualUserTable."user") like ? or (VirtualUserTable."user") = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by 2 desc</sql>
-    <sql name="selectMappings">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1</sql>
-    <sql name="selectMappings" db="postgresql">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user = '*') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain = '*')) order by (VirtualUserTable.user || '@' || VirtualUserTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="derby">select RecipientRewriteTable.target_address,(RecipientRewriteTable."user" || '@' ||RecipientRewriteTable.domain) from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where ((RecipientRewriteTable."user") like ? or (RecipientRewriteTable."user") = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by 2 desc</sql>
+    <sql name="selectMappings">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1</sql>
+    <sql name="selectMappings" db="postgresql">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by (RecipientRewriteTable.user || '@' || RecipientRewriteTable.domain) desc limit 1</sql>
     
-    <sql name="selectUserDomainMapping" db="derby">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
-    <sql name="selectUserDomainMapping">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable.user = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping" db="derby">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
+    <sql name="selectUserDomainMapping">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable.user = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="deleteMapping">delete from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? and VirtualUserTable.target_address = ?</sql>
+    <sql name="deleteMapping">delete from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? and RecipientRewriteTable.target_address = ?</sql>
    
-    <sql name="updateMapping">update VirtualUserTable set VirtualUserTable.target_address = ? where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
+    <sql name="updateMapping">update RecipientRewriteTable set RecipientRewriteTable.target_address = ? where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
    
-    <sql name="addMapping">insert into VirtualUserTable values(?,?,?) </sql>
+    <sql name="addMapping">insert into RecipientRewriteTable values(?,?,?) </sql>
     
-    <sql name="selectAllMappings">select * from VirtualUserTable </sql>
+    <sql name="selectAllMappings">select * from RecipientRewriteTable </sql>
     
-    <sql name="selectDomains">select distinct domain from VirtualUserTable</sql>
+    <sql name="selectDomains">select distinct domain from RecipientRewriteTable</sql>
     
-    <sql name="selectDomain">select distinct domain from VirtualUserTable where domain = ? </sql>
+    <sql name="selectDomain">select distinct domain from RecipientRewriteTable where domain = ? </sql>
     
     <!-- Statements used to create the table associated with this class. -->
     <sql name="createTable" db="mysql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -928,7 +928,7 @@
     <!-- TEMPORARY DISABLED -->
     <!--
     <sql name="createTable" db="hypersonic">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -936,7 +936,7 @@
         )
     </sql>
     <sql name="createTable" db="hsqldb">
-        CREATE CACHED TABLE VirtualUserTable (
+        CREATE CACHED TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -944,7 +944,7 @@
         )
     </sql>
     <sql name="createTable" db="mssql">
-        CREATE TABLE [VirtualUserTable] (
+        CREATE TABLE [RecipientRewriteTable] (
             [user] [varchar] (64) NOT NULL default '',
             [domain] [varchar] (255) NOT NULL default '',
             [target_address] [varchar] (255) NOT NULL default '',
@@ -952,7 +952,7 @@
         )
     </sql>
     <sql name="createTable" db="oracle">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar2(64) NOT NULL default '',
             domain varchar2(255) NOT NULL default '',
             target_address varchar2(255) NOT NULL default '',
@@ -960,7 +960,7 @@
         )
     </sql>
     <sql name="createTable" db="sapdb">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -968,7 +968,7 @@
         )
     </sql>
     <sql name="createTable" db="db2">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -976,7 +976,7 @@
         )
     </sql>
     <sql name="createTable" db="ingres">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             user varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -985,7 +985,7 @@
     </sql>
     -->
     <sql name="createTable" db="postgresql">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar(64) NOT NULL default '',
             domain varchar(255) NOT NULL default '',
             target_address varchar(255) NOT NULL default '',
@@ -993,7 +993,7 @@
         )
     </sql>
     <sql name="createTable" db="derby">
-        CREATE TABLE VirtualUserTable (
+        CREATE TABLE RecipientRewriteTable (
             "user" varchar (64) NOT NULL default '',
             domain varchar (255) NOT NULL default '',
             target_address varchar (255) NOT NULL default '',

Modified: james/server/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/pom.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/jpa/pom.xml (original)
+++ james/server/trunk/jpa/pom.xml Wed Apr  6 15:44:05 2011
@@ -36,7 +36,7 @@
         <artifactId>openjpa-maven-plugin</artifactId>
         <version>1.1</version>
         <configuration>
-          <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/vut/jpa/model/JPAVirtualUser.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes>
+          <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/vut/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes>
           <addDefaultConstructor>true</addDefaultConstructor>
           <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
           <toolProperties>
@@ -46,7 +46,7 @@
             </property>   
             <property>
               <name>metaDataFactory</name>
-              <value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.vut.jpa.model.JPAVirtualUser;org.apache.james.domainlist.jpa.model.JPADomain)</value>
+              <value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.rrt.jpa.model.JPARecipientRewrite;org.apache.james.domainlist.jpa.model.JPADomain)</value>
             </property>           
           </toolProperties>
         </configuration>  

Modified: james/server/trunk/src/site/xdoc/dev-provided-mailets.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev-provided-mailets.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev-provided-mailets.xml (original)
+++ james/server/trunk/src/site/xdoc/dev-provided-mailets.xml Wed Apr  6 15:44:05 2011
@@ -285,7 +285,7 @@ of the data-source in mailetcontainer.xm
 </p>
 </subsection>
 
-<subsection name="JDBCVirtualUserTable">
+<subsection name="JDBCRecipientRewriteTable">
 <p>Description: This mailet does complex alias translation for email addresses stored in a database table.</p>
 
 <p>Parameters:
@@ -294,7 +294,7 @@ of the data-source in mailetcontainer.xm
 db://&lt;data-source&gt;/&lt;table&gt; where &lt;data-source&gt; and &lt;table&gt; are the names of 
 the data-source as defined in mailetcontainer.xml and the table in the database.</li>
 <li><strong>sqlquery</strong> (optional) - the text of the SQL query used by the mailet to do user
-lookup.  The default is "select VirtualUserTable.target-address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user like '\\%') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '\\%' and VUTDomains.domain like ?)) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1"</li>
+lookup.  The default is "select RecipientRewriteTable.target-address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user like '\\%') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain like '\\%' and VUTDomains.domain like ?)) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1"</li>
 </ul>
 </p>
 </subsection>

Modified: james/server/trunk/src/site/xdoc/release-notes.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/release-notes.xml?rev=1089500&r1=1089499&r2=1089500&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/release-notes.xml (original)
+++ james/server/trunk/src/site/xdoc/release-notes.xml Wed Apr  6 15:44:05 2011
@@ -156,7 +156,7 @@
 <ul>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-301'>JAMES-301</a>] - Pop3 TLS and Thunderbird 0.7 do not  go together</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-636'>JAMES-636</a>] - Policy in environment.xml is... ignored?!?</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-745'>JAMES-745</a>] - XMLVirtualUserTable and JDBCVirtualUserTable not work symetric</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-745'>JAMES-745</a>] - XMLRecipientRewriteTable and JDBCRecipientRewriteTable not work symetric</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-749'>JAMES-749</a>] - LDAPUserRepository not work</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-781'>JAMES-781</a>] - James will not start if there is directory with too many files and folders in the repostiory path</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-820'>JAMES-820</a>] - java.io.IOException: Unknown encoding: 8-bit in AttachmentFileNameIs matcher</li>
@@ -167,7 +167,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-876'>JAMES-876</a>] - cannot start as spring-deployment when built from trunk as described in HOW-TO.TXT</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-877'>JAMES-877</a>] - cannot start spring-deployment nightly build as described in provided batch file</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-880'>JAMES-880</a>] - bug with sql query for postgresql jdbc driver</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-882'>JAMES-882</a>] - VirtualUserTable-Store is not working anymore</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-882'>JAMES-882</a>] - RecipientRewriteTable-Store is not working anymore</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-883'>JAMES-883</a>] - Rare Deadlock in pop3server/pop3servertest found on hudson.</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-899'>JAMES-899</a>] - RemoteDelivery sends a message again and again if transport.close() throws a MessagingException</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-904'>JAMES-904</a>] - DB Connection problem: Reason in log: Component named "database-connections" failed to pass through the Starting stage.</li>
@@ -189,10 +189,10 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-979'>JAMES-979</a>] - IOException when closing mail client</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-981'>JAMES-981</a>] - OOM when using ConsumerTemplate (JMS) for RemoteDelivery</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-986'>JAMES-986</a>] - MailImpl.dispose() is not always called and so .m64 files are leaked</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-988'>JAMES-988</a>] - JDBC VirtualUserTable does not provide implementation of the domainlist service</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-988'>JAMES-988</a>] - JDBC RecipientRewriteTable does not provide implementation of the domainlist service</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-990'>JAMES-990</a>] - Exception at first start for JDBCDomainList Configuration</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-991'>JAMES-991</a>] - IllegalStateException during shutdown</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-994'>JAMES-994</a>] - JDBCVirtualUserTable does not work when using Postgresql</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-994'>JAMES-994</a>] - JDBCRecipientRewriteTable does not work when using Postgresql</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-995'>JAMES-995</a>] - Unable to spool message on windows</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-996'>JAMES-996</a>] - Spamassassin plugin in not working in current trunk</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-998'>JAMES-998</a>] - XMLDomainList throws NPE if no domainname was specified</li>
@@ -206,7 +206,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1014'>JAMES-1014</a>] - Terminating Open Connections</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1016'>JAMES-1016</a>] - Snapshot deployment of spring-deployment fails.</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1017'>JAMES-1017</a>] - Exception when trying to start tomcat with james-server-spring-deployment-3.0-SNAPSHOT.war and java 1.5</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1019'>JAMES-1019</a>] - getDomainsInternal in JDBCVirtualUserTable needs reworked</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1019'>JAMES-1019</a>] - getDomainsInternal in JDBCRecipientRewriteTable needs reworked</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1021'>JAMES-1021</a>] - Base64 encoded messages get corrupted when posting to Mailbox</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1023'>JAMES-1023</a>] - SMTPServer does not respect the verifyIdentity configuration</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1024'>JAMES-1024</a>] - JDBCGreylistHandler does not respect the whitelistedNetworks configuration</li>
@@ -214,7 +214,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1026'>JAMES-1026</a>] - No consumers available on endpoint: Endpoint[direct://mailserver]</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1030'>JAMES-1030</a>] - ValidRcptHandler returns 554 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1033'>JAMES-1033</a>] - IMAPServer does not disconnect client after idle 30 minutes</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1035'>JAMES-1035</a>] - XML/JDBCVirtualUserTable should not implement DomainList</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1035'>JAMES-1035</a>] - XML/JDBCRecipientRewriteTable should not implement DomainList</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1038'>JAMES-1038</a>] - Fetchmail gives error in (pre) 3.0 codeline</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1044'>JAMES-1044</a>] - SpringProtocolHandlerChain does not load handlers correctly when the same handler is used for different ProtocolHandlerChain instances</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1061'>JAMES-1061</a>] - NPE when connect to smtpserver with ipv6 ipaddress</li>
@@ -240,7 +240,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-805'>JAMES-805</a>] - Change arg0, arg1 etc parameters to the original javadoc names.</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-825'>JAMES-825</a>] - spring-deployment: Adopt HOW-TO for binary distribution</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-902'>JAMES-902</a>] - Upgrade to JavaMail 1.4.2</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-919'>JAMES-919</a>] - Export DefaultVirtualUserTable through VirtualUserTableStore API</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-919'>JAMES-919</a>] - Export DefaultRecipientRewriteTable through RecipientRewriteTableStore API</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-923'>JAMES-923</a>] - [smtp] Replace Avalon interfaces with injection</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-938'>JAMES-938</a>] - IMAP should work with VirtualHosting</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-947'>JAMES-947</a>] - Spring deployment should pick up jars in conf/lib and add it to classpath </li>
@@ -252,7 +252,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1008'>JAMES-1008</a>] - Rename meta-inf to META-INF in javamail-util</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1020'>JAMES-1020</a>] - ReadOnlyUsersLDAPRepository should use search instead of list for finding users</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1034'>JAMES-1034</a>] - IsWhitelist matcher should be able to match against domains and ipaddresses / networks</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1037'>JAMES-1037</a>] - Implement JPADomainList and JPAVirtualUserTable</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1037'>JAMES-1037</a>] - Implement JPADomainList and JPARecipientRewriteTable</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1039'>JAMES-1039</a>] - Move javamail-util to common-util</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1046'>JAMES-1046</a>] - Improve Activemq spool</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1048'>JAMES-1048</a>] - Move 2.3 mail persistence classes to mail/spool projects</li>
@@ -316,7 +316,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-959'>JAMES-959</a>] - Allow to use "plain" ssl for socket with MINA</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-960'>JAMES-960</a>] - Replace DataSourceSelector / DataSource with something else to remove cornerstone dependencies</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-961'>JAMES-961</a>] - Replace cornerstone store</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-962'>JAMES-962</a>] - Mark JamesUser as @deprecated, because Alias and Forward should be set with VirtualUserTable</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-962'>JAMES-962</a>] - Mark JamesUser as @deprecated, because Alias and Forward should be set with RecipientRewriteTable</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-967'>JAMES-967</a>] - Upgrade to spring 3.0.0</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-971'>JAMES-971</a>] - Replace LinearProcessor/StateAwareProcessorList/SpoolManager with CAMEL based implementation</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-983'>JAMES-983</a>] - Rewrite POP3Server to use the MailboxManager / Mailbox backend which is used by IMAP too</li>
@@ -328,7 +328,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1027'>JAMES-1027</a>] - Upgrade to activemq 5.3.2</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1028'>JAMES-1028</a>] - Upgrade Bouncycastle to latest release</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1029'>JAMES-1029</a>] - Remove Torque implementation of imapserver</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1042'>JAMES-1042</a>] - Remove VirtualUserTableStore</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1042'>JAMES-1042</a>] - Remove RecipientRewriteTableStore</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1043'>JAMES-1043</a>] - Upgrade to activemq 5.4.0</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1049'>JAMES-1049</a>] - Upgrade to activemq 5.4.1</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1051'>JAMES-1051</a>] - split spoolmanager module into mailetcontainer-api and mailetcontainer-impl.</li>
@@ -340,7 +340,7 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1075'>JAMES-1075</a>] - Remove Configurable interface from JamesMailetContext</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1082'>JAMES-1082</a>] - Upload james 3.0-M1 artifacts for download</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JAMES-1083'>JAMES-1083</a>] - Enable JMX by default and secure it via user/pass</li>
-<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1088'>JAMES-1088</a>] - Merge VirtualUserTable and ManageableVirtualUserTable</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JAMES-1088'>JAMES-1088</a>] - Merge RecipientRewriteTable and ManageableRecipientRewriteTable</li>
 </ul>
                 
 <h3>Wish</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org