Author: eric Date: Wed Apr 6 15:52:51 2011 New Revision: 1089507 URL: http://svn.apache.org/viewvc?rev=1089507&view=rev Log: Update config and doc to deal with virtualusertable to recipientrewritetable naming (JAMES-1218)
Added: james/server/trunk/container-spring/src/main/config/examples/recipientrewritetable.xml - copied, changed from r1089500, james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml james/server/trunk/container-spring/src/main/config/james/recipientrewritetable.xml - copied, changed from r1089500, james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml Removed: james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml Modified: james/server/trunk/container-spring/src/main/config/examples/mailetcontainer.xml james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml james/server/trunk/src/site/xdoc/config-users.xml james/server/trunk/src/site/xdoc/config.xml james/server/trunk/src/site/xdoc/quick-start.xml 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=1089507&r1=1089506&r2=1089507&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:52:51 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/JDBCRecipientRewriteTable defined in virtualusertable-store.xml) --> + <!-- this requirement through other means (e.g. a XML/JDBCRecipientRewriteTable defined in recipientrewritetable-store.xml) --> <mailet match="All" class="PostmasterAlias"/> <!-- Checks that the email Sender is associated with a valid domain. --> @@ -186,7 +186,7 @@ Regards, Postmaster XXX.YYY <!-- - XMLRecipientRewriteTable is deprecated - Use the definitions in virtualusertable-store.xml + XMLRecipientRewriteTable is deprecated - Use the definitions in recipientrewritetable-store.xml <mailet match="All" class="XMLRecipientRewriteTable"> <!- 1:1 mapping -> @@ -402,9 +402,9 @@ Regards, Postmaster XXX.YYY </mailet> --> - <!-- The RecipientRewriteTable will use the definitions found in virtualusertable-store.xml --> + <!-- The RecipientRewriteTable will use the definitions found in recipientrewritetable-store.xml --> <mailet match="All" class="RecipientRewriteTable"> - <virtualusertable>DefaultRecipientRewriteTable</virtualusertable> + <recipientrewritetable>DefaultRecipientRewriteTable</recipientrewritetable> </mailet> <!-- Is the recipient is for a local account, deliver it locally --> Copied: james/server/trunk/container-spring/src/main/config/examples/recipientrewritetable.xml (from r1089500, 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/recipientrewritetable.xml?p2=james/server/trunk/container-spring/src/main/config/examples/recipientrewritetable.xml&p1=james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml&r1=1089500&r2=1089507&rev=1089507&view=diff ============================================================================== --- james/server/trunk/container-spring/src/main/config/examples/virtualusertable.xml (original) +++ james/server/trunk/container-spring/src/main/config/examples/recipientrewritetable.xml Wed Apr 6 15:52:51 2011 @@ -24,28 +24,28 @@ <!-- 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.rrt.xml.XMLRecipientRewriteTable"> +<recipientrewritetable class="org.apache.james.rrt.xml.XMLRecipientRewriteTable"> <recursiveMapping> true </recursiveMapping> <mappingLimit> 10 </mappingLimit> <mapping> some@domain=someuser </mapping> -</virtualusertable> +</recipientrewritetable> --> <!-- Database backed RecipientRewritetable --> <!-- --> <!-- Use these configurations to store the RecipientRewriteTable in a database. --> <!-- -<virtualusertable class="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable" destinationURL="db://maildb/RecipientRewriteTable"> +<recipientrewritetable class="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable" destinationURL="db://maildb/RecipientRewriteTable"> <recursiveMapping> true </recursiveMapping> <mappingLimit> 10 </mappingLimit> <sqlFile>file://conf/sqlResources.xml</sqlFile> -</virtualusertable> +</recipientrewritetable> --> <!-- The default table for storing James' RecipientRewriteTable mappings. --> -<virtualusertable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable"> +<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable"> <recursiveMapping> true </recursiveMapping> <mappingLimit> 10 </mappingLimit> -</virtualusertable> +</recipientrewritetable> 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=1089507&r1=1089506&r2=1089507&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:52:51 2011 @@ -52,7 +52,7 @@ <value>true</value> </mailet> <mailet match="All" class="RecipientRewriteTable"> - <virtualusertable>DefaultRecipientRewriteTable</virtualusertable> + <recipientrewritetable>DefaultRecipientRewriteTable</recipientrewritetable> </mailet> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> Copied: james/server/trunk/container-spring/src/main/config/james/recipientrewritetable.xml (from r1089500, 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/recipientrewritetable.xml?p2=james/server/trunk/container-spring/src/main/config/james/recipientrewritetable.xml&p1=james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml&r1=1089500&r2=1089507&rev=1089507&view=diff ============================================================================== --- james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml (original) +++ james/server/trunk/container-spring/src/main/config/james/recipientrewritetable.xml Wed Apr 6 15:52:51 2011 @@ -19,7 +19,7 @@ --> <!-- See http://james.apache.org/server/3/config.html for usage --> -<virtualusertable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable"> +<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable"> <recursiveMapping> true </recursiveMapping> <mappingLimit> 10 </mappingLimit> -</virtualusertable> +</recipientrewritetable> Modified: james/server/trunk/src/site/xdoc/config-users.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-users.xml?rev=1089507&r1=1089506&r2=1089507&view=diff ============================================================================== --- james/server/trunk/src/site/xdoc/config-users.xml (original) +++ james/server/trunk/src/site/xdoc/config-users.xml Wed Apr 6 15:52:51 2011 @@ -197,7 +197,7 @@ <section name="Virtual Users Configuration"> - <p>Consult <a href="https://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-M2/container-spring/src/main/config/examples/virtualusertable.xml">virtualusertable.xml</a> in SVN to get some examples and hints.</p> + <p>Consult <a href="https://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-M2/container-spring/src/main/config/examples/recipientrewritetable.xml">recipientrewritetable.xml</a> in SVN to get some examples and hints.</p> </section> Modified: james/server/trunk/src/site/xdoc/config.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config.xml?rev=1089507&r1=1089506&r2=1089507&view=diff ============================================================================== --- james/server/trunk/src/site/xdoc/config.xml (original) +++ james/server/trunk/src/site/xdoc/config.xml Wed Apr 6 15:52:51 2011 @@ -90,7 +90,7 @@ <td></td> </tr> <tr> - <td><a href="https://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-M2/container-spring/src/main/config/examples/virtualusertable.xml">virtualusertable.xml</a></td> + <td><a href="https://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-M2/container-spring/src/main/config/examples/recipientrewritetable.xml">recipientrewritetable.xml</a></td> <td><a href="config-users.html">Users Configuration</a></td> <td></td> </tr> Modified: james/server/trunk/src/site/xdoc/quick-start.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/quick-start.xml?rev=1089507&r1=1089506&r2=1089507&view=diff ============================================================================== --- james/server/trunk/src/site/xdoc/quick-start.xml (original) +++ james/server/trunk/src/site/xdoc/quick-start.xml Wed Apr 6 15:52:51 2011 @@ -105,7 +105,7 @@ smtpserver.xml spring-beans.xml sqlResources.xml usersrepository.xml -virtualusertable.xml +recipientrewritetable.xml wrapper.conf lib folder --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org