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 2010/10/21 11:30:27 UTC
svn commit: r1025903 - in
/james/server/trunk/spring-deployment/src/main/config/james:
META-INF/persistence.xml spring-beans.xml users-store.xml
virtualusertable.xml
Author: eric
Date: Thu Oct 21 09:30:27 2010
New Revision: 1025903
URL: http://svn.apache.org/viewvc?rev=1025903&view=rev
Log:
Adapt config to take into account the user (and vut) repackaging (JAMES1074)
Modified:
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/spring-deployment/src/main/config/james/users-store.xml
james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml
Modified: james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml?rev=1025903&r1=1025902&r2=1025903&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml Thu Oct 21 09:30:27 2010
@@ -47,11 +47,11 @@
<!-- DomainList -->
<class>org.apache.james.domainlist.jpa.model.JPADomain</class>
- <!-- UsersRepository -->
- <class>org.apache.james.userrepository.model.JPAUser</class>
+ <!-- User-->
+ <class>org.apache.james.user.jpa.model.JPAUser</class>
<!-- VirtualUser -->
- <class>org.apache.james.vut.model.JPAVirtualUser</class>
+ <class>org.apache.james.vut.jpa.model.JPAVirtualUser</class>
<properties>
<!-- Create tables on startup -->
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=1025903&r1=1025902&r2=1025903&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 Thu Oct 21 09:30:27 2010
@@ -48,7 +48,7 @@
</property>
<property name="assembler">
<bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces" value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.domainlist.api.DomainListMBean,org.apache.james.domainlist.api.ManageableDomainListMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.management.VirtualUserTableManagementMBean,org.apache.james.user.api.management.UserManagementMBean"/>
+ <property name="managedInterfaces" value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.domainlist.api.DomainListMBean,org.apache.james.domainlist.api.ManageableDomainListMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean"/>
</bean>
</property>
</bean>
@@ -68,9 +68,9 @@
<bean id="processormanagement" class="org.apache.james.mailetcontainer.lib.ProcessorManagement"/>
- <bean id="usermanagement" class="org.apache.james.impl.user.UserManagement" />
+ <bean id="usermanagement" class="org.apache.james.user.lib.UserManagement" />
- <bean id="virtualusertablemanagement" class="org.apache.james.impl.vut.VirtualUserTableManagement" />
+ <bean id="virtualusertablemanagement" class="org.apache.james.vut.lib.VirtualUserTableManagement" />
-->
<bean class="org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor">
@@ -229,28 +229,28 @@
<bean id="mailstore" class="org.apache.james.mailstore.JamesMailStore" />
<!-- The User Storage block -->
- <bean id="users-store" class="org.apache.james.impl.user.JamesUsersStore" >
+ <bean id="users-store" class="org.apache.james.user.lib.JamesUsersStore" >
<property name="defaultRepository" value="LocalUsers"/>
</bean>
<!-- This is needed to link the smtpserver to the local user repository
LocalJamesUsersRepository is used for backward compatibility with
- org.apache.james.impl.jamesuser.LocalJamesUsersRepository can be used for
+ org.apache.james.user.lib.LocalJamesUsersRepository can be used for
backward compatibility with James 2.3.0
- If backward compatibility is not needed, org.apache.james.impl.user.LocalUsersRepository
+ If backward compatibility is not needed, org.apache.james.user.lib.LocalUsersRepository
implementation is used by default.
-->
<!-- uncomment this for james 2.3.0 backward compatibility
- <bean id="localusersrepository" class="org.apache.james.impl.jamesuser.LocalJamesUsersRepository" />
+ <bean id="localusersrepository" class="org.apache.james.user.lib.LocalJamesUsersRepository" />
-->
<!-- this is the default implementation for the localusersrepository - not james 2.3.0 backward compatible -->
- <bean id="localusersrepository" class="org.apache.james.impl.user.LocalUsersRepository" />
+ <bean id="localusersrepository" class="org.apache.james.user.lib.LocalUsersRepository" />
<!-- The context FileSystem implementation -->
<bean id="filesystem" class="org.apache.james.container.spring.SpringFileSystem" />
- <bean id="virtualusertable" name="manageablevirtualusertable" class="org.apache.james.impl.vut.JamesVirtualUserTable" />
+ <bean id="virtualusertable" name="manageablevirtualusertable" class="org.apache.james.vut.lib.JamesVirtualUserTable" />
<!-- The context domainlist implementation -->
<bean id="domainlist" name="domainlistmanagement" class="org.apache.james.domainlist.list.JamesDomainList" />
Modified: james/server/trunk/spring-deployment/src/main/config/james/users-store.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/users-store.xml?rev=1025903&r1=1025902&r2=1025903&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/users-store.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/users-store.xml Thu Oct 21 09:30:27 2010
@@ -17,9 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
+
<!-- The User Storage block -->
<users-store>
+
<!-- Configure User Repositories here. -->
+
<!-- -->
<!-- User repositories are required for the following purposes: -->
<!-- - storing James user information, including forwards, aliases, -->
@@ -38,7 +41,7 @@
<!-- Default: File-based user repositories Use these configurations to store user info in the filesystem -->
<!-- The LocalUsers repository, for storing James' User info. -->
<!--
- <repository name="LocalUsers" class="org.apache.james.userrepository.UsersFileRepository">
+ <repository name="LocalUsers" class="org.apache.james.user.file.UsersFileRepository">
<destination URL="file://var/users/"/>
<ignoreCase>true</ignoreCase>
<enableAliases>true</enableAliases>
@@ -53,7 +56,7 @@
<!-- in the <database-connections> configuration section. -->
<!-- The LocalUsers repository, for storing James' User info. -->
<!--
- <repository name="LocalUsers" class="org.apache.james.userrepository.JamesUsersJdbcRepository" destinationURL="db://maildb/users">
+ <repository name="LocalUsers" class="org.apache.james.user.jdbc.JamesUsersJdbcRepository" destinationURL="db://maildb/users">
<sqlFile>file://conf/sqlResources.xml</sqlFile>
<ignoreCase>true</ignoreCase>
<enableAliases>true</enableAliases>
@@ -63,7 +66,7 @@
<!-- Read-Only LDAP based UsersRepository -->
<!--
- <repository name="LocalUsers" class="org.apache.james.userrepository.ReadOnlyUsersLDAPRepository" ldapHost="ldap://myldapserver:389"
+ <repository name="LocalUsers" class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository" ldapHost="ldap://myldapserver:389"
principal="uid=ldapUser,ou=system" credentials="password" userBase="ou=People,o=myorg.com,ou=system" userIdAttribute="uid"/>;
-->
@@ -71,7 +74,7 @@
<!-- JPA based backend. Support password algorithm are:
MD5, SHA-256, SHA-512, NONE
-->
- <repository name="LocalUsers" class="org.apache.james.userrepository.JPAUsersRepository">
+ <repository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
<algorithm>MD5</algorithm>
</repository>
@@ -82,8 +85,9 @@
<!-- Add a user repository for each list -->
<!-- TODO: add more examples -->
<!--
- <repository name="list-test" class="org.apache.james.userrepository.UsersFileRepository">
+ <repository name="list-test" class="org.apache.james.user.file.UsersFileRepository">
<destination URL="file://var/lists/list-test/"/>
- </repository>
+ </repository>
-->
-</users-store>
\ No newline at end of file
+
+</users-store>
Modified: james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml?rev=1025903&r1=1025902&r2=1025903&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml Thu Oct 21 09:30:27 2010
@@ -27,9 +27,8 @@
<!-- Default true. -->
<!-- By setting the mappingLimit you can specify how much mapping will get processed -->
<!-- before a bounce will send. This avoid infinity loops. Default 10. -->
-
<!--
- <table class="org.apache.james.vut.XMLVirtualUserTable">
+ <table class="org.apache.james.vut.xml.XMLVirtualUserTable">
<recursiveMapping> true </recursiveMapping>
<mappingLimit> 10 </mappingLimit>
@@ -40,9 +39,8 @@
<!-- Database backed VirtualUsertable -->
<!-- -->
<!-- Use these configurations to store the VirtualUserTable in a database. -->
-
<!--
- <table class="org.apache.james.vut.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
+ <table class="org.apache.james.vut.jdbc.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
<recursiveMapping> true </recursiveMapping>
<mappingLimit> 10 </mappingLimit>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
@@ -50,7 +48,7 @@
-->
<!-- The default table for storing James' VirtualUserTable mappings. -->
- <table class="org.apache.james.vut.JPAVirtualUserTable">
+ <table class="org.apache.james.vut.jpa.JPAVirtualUserTable">
<recursiveMapping> true </recursiveMapping>
<mappingLimit> 10 </mappingLimit>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org