Author: norman
Date: Tue Oct 26 09:39:46 2010
New Revision: 1027422
URL: http://svn.apache.org/viewvc?rev=1027422&view=rev
Log:
Mark "old" UsersRepository implementations as deprecated
Modified:
james/server/trunk/container-spring/src/main/config/james/usersrepository.xml
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
Modified:
james/server/trunk/container-spring/src/main/config/james/usersrepository.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/usersrepository.xml?rev=1027422&r1=1027421&r2=1027422&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/james/usersrepository.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/usersrepository.xml
Tue Oct 26 09:39:46 2010
@@ -18,28 +18,39 @@
under the License.
-->
-<!-- The User Storage block -->
-<users-store>
+<usersrepository>
<!-- Configure User Repositories here. -->
<!-- -->
<!-- User repositories are required for the following purposes: -->
- <!-- - storing James user information, including forwards, aliases, -->
- <!-- and authentication data. -->
- <!-- - holding lists of users for the listserv mailet -->
- <!-- Currently, two different storage options are available: -->
- <!-- - file-based storage using Java serialization -->
- <!-- - database-backed storage -->
- <!-- (Use of database or file-system is defined on a "per-repository"
basis) -->
- <!-- -->
+ <!-- - storing James user information and authentication data. -->
<!-- Note: One user repository is required for James: -->
- <!-- LocalUsers - the users for whom you are providing POP3, NNTP, or
SMTP service -->
+ <!-- LocalUsers - the users for whom you are providing POP3, IMAP, or
SMTP service -->
<!-- -->
- <!-- Other repositories may be used by matchers or mailets. -->
- <!-- Default: File-based user repositories Use these configurations to
store user info in the filesystem -->
+
+ <!-- Read-Only LDAP based UsersRepository -->
+ <!--
+ <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"/>;
+ -->
+
+
+ <!-- JPA based backend. Support password algorithm are:
+ MD5, SHA-256, SHA-512, NONE
+ -->
+ <repository name="LocalUsers"
class="org.apache.james.user.jpa.JPAUsersRepository">
+ <algorithm>MD5</algorithm>
+ </repository>
+
+
+ <!-- The UsersRepository implementations below are DEPRECATED and will get
removed in the next release -->
+ <!-- They are just listed here for backward-compatibility-->
+
+ <!-- File-based user repositories Use these configurations to store user
info in the filesystem -->
<!-- The LocalUsers repository, for storing James' User info. -->
+ <!-- DEPRECATED: This implementation will get removed in the next release
-->
<!--
<repository name="LocalUsers"
class="org.apache.james.user.file.UsersFileRepository">
<destination URL="file://var/users/"/>
@@ -55,6 +66,8 @@
<!-- Note: The <data-source> element must refer to a connection configured
-->
<!-- in the <database-connections> configuration section. -->
<!-- The LocalUsers repository, for storing James' User info. -->
+ <!-- DEPRECATED: This implementation will get removed in the next release
-->
+ <!-- Use JPAUsersRepository if you want to store the Users in
a database -->
<!--
<repository name="LocalUsers"
class="org.apache.james.user.jdbc.JamesUsersJdbcRepository"
destinationURL="db://maildb/users">
<sqlFile>file://conf/sqlResources.xml</sqlFile>
@@ -63,31 +76,18 @@
<enableForwarding>true</enableForwarding>
</repository>
-->
-
- <!-- Read-Only LDAP based UsersRepository -->
- <!--
- <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"/>;
- -->
-
-
- <!-- JPA based backend. Support password algorithm are:
- MD5, SHA-256, SHA-512, NONE
- -->
- <repository name="LocalUsers"
class="org.apache.james.user.jpa.JPAUsersRepository">
- <algorithm>MD5</algorithm>
- </repository>
-
+
<!-- This is an example configuration including configuration for a list
server. -->
<!-- CHECKME: before uncommenting this, edit the configuration file's
contents -->
<!-- -->
<!-- Mailing list repositories -->
<!-- Add a user repository for each list -->
<!-- TODO: add more examples -->
+ <!-- DEPRECATED: This implementation will get removed in the next release
-->
<!--
<repository name="list-test"
class="org.apache.james.user.file.UsersFileRepository">
<destination URL="file://var/lists/list-test/"/>
</repository>
-->
-</users-store>
+</usersrepository>
Modified:
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java?rev=1027422&r1=1027421&r2=1027422&view=diff
==============================================================================
---
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
(original)
+++
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
Tue Oct 26 09:39:46 2010
@@ -49,6 +49,7 @@ import javax.annotation.Resource;
* @version CVS $Revision: 521427 $
*
*/
+...@deprecated
public class UsersFileRepository
extends AbstractJamesUsersRepository {
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java?rev=1027422&r1=1027421&r2=1027422&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
Tue Oct 26 09:39:46 2010
@@ -65,8 +65,10 @@ import javax.sql.DataSource;
* <TH><TD><B>Optional</B></TD></TH>
* <TR><TD>selectByLowercaseName</TD><TD>Select a user by name
(case-insensitive lowercase).</TD></TR>
* </TABLE>
+ *
*
*/
+...@deprecated
public abstract class AbstractJdbcUsersRepository extends
AbstractJamesUsersRepository {
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java?rev=1027422&r1=1027421&r2=1027422&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
Tue Oct 26 09:39:46 2010
@@ -42,14 +42,10 @@ import javax.annotation.PostConstruct;
* instead of this class. So we could also delete this implementation.
*
*/
+...@deprecated
public class DefaultUsersJdbcRepository extends AbstractJdbcUsersRepository
{
- // REMOVE ME!
- @PostConstruct
- @Override
- public void init() throws Exception {
- super.init();
- }
+
/**
* @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java?rev=1027422&r1=1027421&r2=1027422&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
Tue Oct 26 09:39:46 2010
@@ -34,6 +34,7 @@ import java.sql.SQLException;
* A Jdbc-backed UserRepository which handles User instances of the
<CODE>DefaultJamesUser</CODE>
* class, or any superclass.
*/
+...@deprecated
public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository {
/**
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java?rev=1027422&r1=1027421&r2=1027422&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
Tue Oct 26 09:39:46 2010
@@ -35,8 +35,8 @@ import java.sql.SQLException;
* persisted.
*
*/
-public class ListUsersJdbcRepository extends AbstractJdbcUsersRepository
-{
+...@deprecated
+public class ListUsersJdbcRepository extends AbstractJdbcUsersRepository {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
