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 ba...@apache.org on 2008/08/10 15:52:29 UTC
svn commit: r684502 - in /james/server/trunk:
avalon-user-function/src/main/java/org/apache/james/userrepository/
avalon-user-function/src/main/java/org/apache/james/vut/
avalon-user-function/src/test/java/org/apache/james/management/
avalon-user-funct...
Author: bago
Date: Sun Aug 10 06:52:26 2008
New Revision: 684502
URL: http://svn.apache.org/viewvc?rev=684502&view=rev
Log:
Repackaging for the user api/library code, in progress.
Moved XMLVirtuserTable.xinfo to basic-user-function.
Moved XMLResources to common-util
Refactored remaining classes into o.a.j.impl.(vut|user|jamesuser) packages.
Added:
james/server/trunk/basic-user-function/src/main/resources/org/
james/server/trunk/basic-user-function/src/main/resources/org/apache/
james/server/trunk/basic-user-function/src/main/resources/org/apache/james/
james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/
- copied from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/vut/
james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo
- copied unchanged from r684501, james/server/trunk/user-library/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo
james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/util/XMLResources.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
- copied, changed from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/JamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java (contents, props changed)
- copied, changed from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultVirtualUserTable.java (contents, props changed)
- copied, changed from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DigestUtil.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/package.html
- copied unchanged from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/package.html
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (contents, props changed)
- copied, changed from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java (contents, props changed)
- copied, changed from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java
- copied, changed from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo
- copied, changed from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalJamesUsersRepository.xinfo
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/LocalUsersRepository.xinfo (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalUsersRepository.xinfo
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/UserManagement.xinfo (contents, props changed)
- copied, changed from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/management/UserManagement.xinfo
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/vut/
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/vut/DefaultVirtualUserTable.xinfo
- copied unchanged from r684488, james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/DefaultVirtualUserTable.xinfo
james/server/trunk/user-library/src/main/resources/org/apache/james/impl/vut/VirtualUserTableManagement.xinfo
- copied unchanged from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/management/VirtualUserTableManagement.xinfo
Removed:
james/server/trunk/user-library/src/main/java/org/apache/james/management/
james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/
james/server/trunk/user-library/src/main/java/org/apache/james/util/
james/server/trunk/user-library/src/main/java/org/apache/james/vut/
james/server/trunk/user-library/src/main/resources/org/apache/james/management/
james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/
james/server/trunk/user-library/src/main/resources/org/apache/james/vut/
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java
james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Sun Aug 10 06:52:26 2008
@@ -29,6 +29,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.api.user.User;
+import org.apache.james.impl.jamesuser.AbstractUsersRepository;
import org.apache.james.services.FileSystem;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java Sun Aug 10 06:52:26 2008
@@ -22,6 +22,7 @@
package org.apache.james.userrepository;
import org.apache.james.api.user.User;
+import org.apache.james.impl.user.DefaultUser;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java Sun Aug 10 06:52:26 2008
@@ -22,6 +22,8 @@
package org.apache.james.userrepository;
import org.apache.james.api.user.User;
+import org.apache.james.impl.user.DefaultJamesUser;
+import org.apache.james.impl.user.DefaultUser;
import org.apache.mailet.MailAddress;
import java.sql.PreparedStatement;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java Sun Aug 10 06:52:26 2008
@@ -22,6 +22,7 @@
package org.apache.james.userrepository;
import org.apache.james.api.user.User;
+import org.apache.james.impl.user.DefaultUser;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -38,7 +39,7 @@
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String password) {
// list repository does not store passwords so we always return false!
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java Sun Aug 10 06:52:26 2008
@@ -32,8 +32,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.api.user.User;
-import org.apache.james.userrepository.AbstractUsersRepository;
-import org.apache.james.userrepository.DefaultJamesUser;
+import org.apache.james.impl.jamesuser.AbstractUsersRepository;
+import org.apache.james.impl.user.DefaultJamesUser;
import java.util.Iterator;
@@ -147,7 +147,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#doAddUser(org.apache.james.api.user.User)
+ * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doAddUser(org.apache.james.api.user.User)
*/
protected void doAddUser(User user) {
try {
@@ -225,7 +225,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#doUpdateUser(org.apache.james.api.user.User)
+ * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doUpdateUser(org.apache.james.api.user.User)
*/
public void doUpdateUser(User user) {
try {
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -44,6 +44,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.impl.vut.AbstractVirtualUserTable;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.FileSystem;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
@@ -249,7 +251,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
*/
public String mapAddressInternal(String user, String domain) {
Connection conn = null;
@@ -281,7 +283,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
*/
public boolean removeMappingInternal(String user, String domain, String mapping) throws InvalidMappingException {
String newUser = getUserString(user);
@@ -298,7 +300,7 @@
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#addMappingInternal(String, String, String)
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#addMappingInternal(String, String, String)
*/
public boolean addMappingInternal(String user, String domain, String regex) throws InvalidMappingException {
String newUser = getUserString(user);
@@ -470,7 +472,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#mapAddress(java.lang.String, java.lang.String)
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddress(java.lang.String, java.lang.String)
*/
protected Collection getUserDomainMappingsInternal(String user, String domain) {
Connection conn = null;
@@ -502,7 +504,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#getDomainsInternal()
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getDomainsInternal()
*/
protected List getDomainsInternal() {
List domains = new ArrayList();
@@ -571,7 +573,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#getAllMappingsInternal()
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
*/
public Map getAllMappingsInternal() {
Connection conn = null;
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java Sun Aug 10 06:52:26 2008
@@ -26,6 +26,7 @@
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.user.management.UserManagementException;
+import org.apache.james.impl.user.UserManagement;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.james.MockUsersStore;
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Sun Aug 10 06:52:26 2008
@@ -28,6 +28,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
Modified: james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java (original)
+++ james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java Sun Aug 10 06:52:26 2008
@@ -26,8 +26,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.api.user.User;
-import org.apache.james.userrepository.AbstractUsersRepository;
-import org.apache.james.userrepository.DefaultUser;
+import org.apache.james.impl.jamesuser.AbstractUsersRepository;
+import org.apache.james.impl.user.DefaultUser;
import javax.naming.AuthenticationException;
import javax.naming.NamingEnumeration;
Modified: james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java (original)
+++ james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -31,6 +31,8 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.james.impl.vut.AbstractVirtualUserTable;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
public class XMLVirtualUserTable extends AbstractVirtualUserTable implements Configurable {
/**
@@ -95,7 +97,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
*/
protected String mapAddressInternal(String user, String domain) {
if (mappings == null) {
@@ -115,7 +117,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#getUserDomainMappingsInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getUserDomainMappingsInternal(java.lang.String, java.lang.String)
*/
public Collection getUserDomainMappingsInternal(String user, String domain) {
if (mappings == null) {
@@ -131,7 +133,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#getDomainsInternal()
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getDomainsInternal()
*/
protected List getDomainsInternal() {
return domains;
@@ -149,7 +151,7 @@
}
/**
- * @see org.apache.james.vut.AbstractVirtualUserTable#getAllMappingsInternal()
+ * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
*/
public Map getAllMappingsInternal() {
if ( mappings != null && mappings.size() > 0) {
Modified: james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Sun Aug 10 06:52:26 2008
@@ -32,6 +32,8 @@
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.impl.vut.AbstractVirtualUserTable;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
Copied: james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/util/XMLResources.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/util/XMLResources.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
(empty)
Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1.2.4
Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/XMLResources.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -23,7 +23,7 @@
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
-import org.apache.james.vut.VirtualUserTableUtil;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -25,8 +25,8 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.util.JDBCUtil;
-import org.apache.james.vut.VirtualUserTableUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -28,7 +28,7 @@
import javax.mail.MessagingException;
-import org.apache.james.vut.VirtualUserTableUtil;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Sun Aug 10 06:52:26 2008
@@ -119,7 +119,7 @@
</block>
<!-- The User Management block -->
- <block name="usermanagement" class="org.apache.james.management.UserManagement" >
+ <block name="usermanagement" class="org.apache.james.impl.user.UserManagement" >
<provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
<provide name="users-store" role="org.apache.james.api.user.UsersStore"/>
</block>
@@ -242,7 +242,7 @@
<!-- This is needed to support <usernames> configuraion inside James -->
<!-- If backward compatibility is not need the LocalUsersRepository implementaion -->
<!-- could be safely used -->
- <block name="localusersrepository" class="org.apache.james.userrepository.LocalJamesUsersRepository">
+ <block name="localusersrepository" class="org.apache.james.impl.jamesuser.LocalJamesUsersRepository">
<provide name="users-store"
role="org.apache.james.api.user.UsersStore"/>
</block>
@@ -252,7 +252,7 @@
</block>
<!-- The VirtualUserTable Management block -->
- <block name="virtualusertablemanagement" class="org.apache.james.management.VirtualUserTableManagement" >
+ <block name="virtualusertablemanagement" class="org.apache.james.impl.vut.VirtualUserTableManagement" >
<provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/>
<provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" />
</block>
@@ -265,7 +265,7 @@
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
- <block name="defaultvirtualusertable" class="org.apache.james.userrepository.DefaultVirtualUserTable">
+ <block name="defaultvirtualusertable" class="org.apache.james.impl.user.DefaultVirtualUserTable">
<provide name="virtualusertable-store"
role="org.apache.james.api.vut.VirtualUserTableStore"/>
</block>
Modified: james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java Sun Aug 10 06:52:26 2008
@@ -30,8 +30,8 @@
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
import org.apache.james.domain.XMLDomainList;
+import org.apache.james.impl.vut.VirtualUserTableManagement;
import org.apache.james.management.DomainListManagement;
-import org.apache.james.management.VirtualUserTableManagement;
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.services.DNSServer;
import org.apache.james.services.DomainListManagementService;
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java Sun Aug 10 06:52:26 2008
@@ -42,6 +42,7 @@
import org.apache.james.core.MailImpl;
import org.apache.james.core.MailetConfigImpl;
import org.apache.james.dnsserver.TemporaryResolutionException;
+import org.apache.james.impl.jamesuser.JamesUsersRepository;
import org.apache.james.services.DNSServer;
import org.apache.james.services.DomainList;
import org.apache.james.services.FileSystem;
@@ -50,7 +51,6 @@
import org.apache.james.services.ManageableDomainList;
import org.apache.james.services.SpoolRepository;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.userrepository.JamesUsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mailet;
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java Sun Aug 10 06:52:26 2008
@@ -35,11 +35,11 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
+import org.apache.james.impl.user.DefaultUser;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.userrepository.DefaultUser;
import org.apache.jsieve.SieveFactory;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.mailet.GenericMailet;
Modified: james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java (original)
+++ james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java Sun Aug 10 06:52:26 2008
@@ -23,6 +23,7 @@
import org.apache.james.Constants;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
+import org.apache.james.impl.user.DefaultJamesUser;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.test.mock.avalon.MockServiceManager;
@@ -33,7 +34,6 @@
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMailetConfig;
import org.apache.james.test.mock.util.MailUtil;
-import org.apache.james.userrepository.DefaultJamesUser;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml Sun Aug 10 06:52:26 2008
@@ -119,7 +119,7 @@
</block>
<!-- The User Management block -->
- <block name="usermanagement" class="org.apache.james.management.UserManagement" >
+ <block name="usermanagement" class="org.apache.james.impl.user.UserManagement" >
<provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
<provide name="users-store" role="org.apache.james.api.user.UsersStore"/>
</block>
@@ -242,7 +242,7 @@
<!-- This is needed to support <usernames> configuraion inside James -->
<!-- If backward compatibility is not need the LocalUsersRepository implementaion -->
<!-- could be safely used -->
- <block name="localusersrepository" class="org.apache.james.userrepository.LocalJamesUsersRepository">
+ <block name="localusersrepository" class="org.apache.james.impl.jamesuser.LocalJamesUsersRepository">
<provide name="users-store"
role="org.apache.james.api.user.UsersStore"/>
</block>
@@ -252,7 +252,7 @@
</block>
<!-- The VirtualUserTable Management block -->
- <block name="virtualusertablemanagement" class="org.apache.james.management.VirtualUserTableManagement" >
+ <block name="virtualusertablemanagement" class="org.apache.james.impl.vut.VirtualUserTableManagement" >
<provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/>
<provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" />
</block>
@@ -265,7 +265,7 @@
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
- <block name="defaultvirtualusertable" class="org.apache.james.userrepository.DefaultVirtualUserTable">
+ <block name="defaultvirtualusertable" class="org.apache.james.impl.user.DefaultVirtualUserTable">
<provide name="virtualusertable-store"
role="org.apache.james.api.vut.VirtualUserTableStore"/>
</block>
Modified: james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml Sun Aug 10 06:52:26 2008
@@ -134,7 +134,7 @@
</block>
<!-- The User Management block -->
- <block name="usermanagement" class="org.apache.james.management.UserManagement" >
+ <block name="usermanagement" class="org.apache.james.impl.user.UserManagement" >
<provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
<provide name="users-store" role="org.apache.james.api.user.UsersStore"/>
</block>
@@ -252,7 +252,7 @@
<!-- This is needed to support <usernames> configuraion inside James -->
<!-- If backward compatibility is not need the LocalUsersRepository implementaion -->
<!-- could be safely used -->
- <block name="localusersrepository" class="org.apache.james.userrepository.LocalJamesUsersRepository">
+ <block name="localusersrepository" class="org.apache.james.impl.jamesuser.LocalJamesUsersRepository">
<provide name="users-store"
role="org.apache.james.api.user.UsersStore"/>
</block>
@@ -262,7 +262,7 @@
</block>
<!-- The VirtualUserTable Management block -->
- <block name="virtualusertablemanagement" class="org.apache.james.management.VirtualUserTableManagement" >
+ <block name="virtualusertablemanagement" class="org.apache.james.impl.vut.VirtualUserTableManagement" >
<provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/>
<provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" />
</block>
@@ -275,7 +275,7 @@
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
- <block name="defaultvirtualusertable" class="org.apache.james.userrepository.DefaultVirtualUserTable">
+ <block name="defaultvirtualusertable" class="org.apache.james.impl.user.DefaultVirtualUserTable">
<provide name="virtualusertable-store"
role="org.apache.james.api.vut.VirtualUserTableStore"/>
</block>
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java (from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java&r1=684495&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.impl.jamesuser;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -28,6 +28,7 @@
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.User;
import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.impl.user.DefaultUser;
import java.util.ArrayList;
import java.util.Collection;
@@ -191,21 +192,21 @@
}
/**
- * @see org.apache.james.userrepository.JamesUsersRepository#setEnableAliases(boolean)
+ * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableAliases(boolean)
*/
public void setEnableAliases(boolean enableAliases) {
this.enableAliases = enableAliases;
}
/**
- * @see org.apache.james.userrepository.JamesUsersRepository#setEnableForwarding(boolean)
+ * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableForwarding(boolean)
*/
public void setEnableForwarding(boolean enableForwarding) {
this.enableForwarding = enableForwarding;
}
/**
- * @see org.apache.james.userrepository.JamesUsersRepository#setIgnoreCase(boolean)
+ * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setIgnoreCase(boolean)
*/
public void setIgnoreCase(boolean ignoreCase) {
this.ignoreCase = ignoreCase;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/JamesUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/JamesUsersRepository.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/JamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java Sun Aug 10 06:52:26 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.impl.jamesuser;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTable;
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java (from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java&r1=684495&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java Sun Aug 10 06:52:26 2008
@@ -17,9 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.impl.jamesuser;
import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.impl.user.LocalUsersRepository;
import java.util.Collection;
@@ -31,21 +32,21 @@
public class LocalJamesUsersRepository extends LocalUsersRepository implements JamesUsersRepository{
/**
- * @see org.apache.james.userrepository.JamesUsersRepository#setEnableAliases(boolean)
+ * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableAliases(boolean)
*/
public void setEnableAliases(boolean enableAliases) {
((JamesUsersRepository) users).setEnableAliases(enableAliases);
}
/**
- * @see org.apache.james.userrepository.JamesUsersRepository#setEnableForwarding(boolean)
+ * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableForwarding(boolean)
*/
public void setEnableForwarding(boolean enableForwarding) {
((JamesUsersRepository) users).setEnableForwarding(enableForwarding);
}
/**
- * @see org.apache.james.userrepository.JamesUsersRepository#setIgnoreCase(boolean)
+ * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setIgnoreCase(boolean)
*/
public void setIgnoreCase(boolean ignoreCase) {
((JamesUsersRepository) users).setIgnoreCase(ignoreCase);
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.impl.user;
import org.apache.james.api.user.JamesUser;
import org.apache.mailet.MailAddress;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultUser.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultUser.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.impl.user;
import org.apache.james.api.user.User;
@@ -104,7 +104,7 @@
*
* @return the String of the hashed Password
*/
- protected String getHashedPassword() {
+ public String getHashedPassword() {
return hashedPassword;
}
@@ -113,7 +113,7 @@
*
* @return the name of the hashing algorithm used for this user's password
*/
- protected String getHashAlgorithm() {
+ public String getHashAlgorithm() {
return algorithm;
}
}
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultVirtualUserTable.java (from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultVirtualUserTable.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultVirtualUserTable.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java&r1=684495&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.impl.user;
import java.util.Collection;
import java.util.Map;
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultVirtualUserTable.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DigestUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DigestUtil.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DigestUtil.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.impl.user;
import javax.mail.MessagingException;
import javax.mail.internet.MimeUtility;
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6.4.3
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalUsersRepository.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java Sun Aug 10 06:52:26 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.impl.user;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.service.ServiceException;
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java Sun Aug 10 06:52:26 2008
@@ -20,7 +20,7 @@
-package org.apache.james.management;
+package org.apache.james.impl.user;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java&r1=684495&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.vut;
+package org.apache.james.impl.vut;
import java.net.UnknownHostException;
import java.util.ArrayList;
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java (from r684495, james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java&r1=684495&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.management;
+package org.apache.james.impl.vut;
import java.util.Collection;
import java.util.Map;
@@ -33,7 +33,7 @@
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.api.vut.management.VirtualUserTableManagementMBean;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
-import org.apache.james.userrepository.DefaultVirtualUserTable;
+import org.apache.james.impl.user.DefaultVirtualUserTable;
/**
Propchange: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java (from r684487, james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java Sun Aug 10 06:52:26 2008
@@ -19,7 +19,7 @@
-package org.apache.james.vut;
+package org.apache.james.impl.vut;
import java.util.ArrayList;
import java.util.Collection;
Copied: james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo (from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalJamesUsersRepository.xinfo)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo?p2=james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo&p1=james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalJamesUsersRepository.xinfo&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalJamesUsersRepository.xinfo (original)
+++ james/server/trunk/user-library/src/main/resources/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.xinfo Sun Aug 10 06:52:26 2008
@@ -28,7 +28,7 @@
<!-- services that are offered by this block -->
<services>
<service name="org.apache.james.api.user.UsersRepository" version="1.0" />
- <service name="org.apache.james.userrepository.JamesUsersRepository" version="1.0" />
+ <service name="org.apache.james.impl.jamesuser.JamesUsersRepository" version="1.0" />
<service name="org.apache.james.api.vut.VirtualUserTable" version="1.0" />
</services>
Copied: james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/LocalUsersRepository.xinfo (from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalUsersRepository.xinfo)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/LocalUsersRepository.xinfo?p2=james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/LocalUsersRepository.xinfo&p1=james/server/trunk/user-library/src/main/resources/org/apache/james/userrepository/LocalUsersRepository.xinfo&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
(empty)
Propchange: james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/LocalUsersRepository.xinfo
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/UserManagement.xinfo (from r684487, james/server/trunk/user-library/src/main/resources/org/apache/james/management/UserManagement.xinfo)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/UserManagement.xinfo?p2=james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/UserManagement.xinfo&p1=james/server/trunk/user-library/src/main/resources/org/apache/james/management/UserManagement.xinfo&r1=684487&r2=684502&rev=684502&view=diff
==============================================================================
(empty)
Propchange: james/server/trunk/user-library/src/main/resources/org/apache/james/impl/user/UserManagement.xinfo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java Sun Aug 10 06:52:26 2008
@@ -28,7 +28,7 @@
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
-import org.apache.james.vut.VirtualUserTableUtil;
+import org.apache.james.impl.vut.VirtualUserTableUtil;
public class MockVirtualUserTableManagementImpl implements VirtualUserTableManagement {
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java Sun Aug 10 06:52:26 2008
@@ -20,6 +20,10 @@
package org.apache.james.userrepository;
import org.apache.james.api.user.User;
+import org.apache.james.impl.jamesuser.AbstractUsersRepository;
+import org.apache.james.impl.user.DefaultJamesUser;
+import org.apache.james.impl.user.DefaultUser;
+import org.apache.james.impl.user.DigestUtil;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java Sun Aug 10 06:52:26 2008
@@ -22,6 +22,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.api.user.User;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.impl.user.DefaultJamesUser;
import java.util.ArrayList;
import java.util.Iterator;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=684502&r1=684501&r2=684502&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java Sun Aug 10 06:52:26 2008
@@ -32,6 +32,7 @@
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.dnsserver.TemporaryResolutionException;
+import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.services.DNSServer;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org