Author: bago Date: Sun Aug 10 05:10:16 2008 New Revision: 684480 URL: http://svn.apache.org/viewvc?rev=684480&view=rev Log: Repackaging for the user api/library code, in progress. Moved VirtuserTableUtil to vut package (better than util)
Added: james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java - copied, changed from r684466, james/server/trunk/user-library/src/main/java/org/apache/james/util/VirtualUserTableUtil.java Removed: james/server/trunk/user-library/src/main/java/org/apache/james/util/VirtualUserTableUtil.java Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.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/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java 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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -47,7 +47,6 @@ import org.apache.james.services.FileSystem; import org.apache.james.util.JDBCUtil; import org.apache.james.util.SqlResources; -import org.apache.james.util.VirtualUserTableUtil; /** * 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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -31,7 +31,6 @@ 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.util.VirtualUserTableUtil; public class XMLVirtualUserTable extends AbstractVirtualUserTable implements Configurable { /** 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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -40,7 +40,6 @@ import org.apache.james.test.mock.james.MockFileSystem; import org.apache.james.test.mock.util.AttrValConfiguration; -import org.apache.james.util.VirtualUserTableUtil; public class XMLVirtualUserTableTest extends AbstractVirtualUserTableTest { DefaultConfiguration defaultConfiguration = new DefaultConfiguration("conf"); 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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -23,7 +23,7 @@ import org.apache.james.Constants; import org.apache.james.core.MailImpl; -import org.apache.james.util.VirtualUserTableUtil; +import org.apache.james.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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -26,7 +26,7 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.james.Constants; import org.apache.james.util.JDBCUtil; -import org.apache.james.util.VirtualUserTableUtil; +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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -28,7 +28,7 @@ import javax.mail.MessagingException; -import org.apache.james.util.VirtualUserTableUtil; +import org.apache.james.vut.VirtualUserTableUtil; import org.apache.mailet.MailAddress; /** Modified: 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/vut/AbstractVirtualUserTable.java?rev=684480&r1=684479&r2=684480&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/vut/AbstractVirtualUserTable.java Sun Aug 10 05:10:16 2008 @@ -45,7 +45,6 @@ import org.apache.james.services.DomainList; import org.apache.james.services.VirtualUserTableManagement; import org.apache.james.util.DomainListUtil; -import org.apache.james.util.VirtualUserTableUtil; import org.apache.mailet.MailAddress; import org.apache.oro.text.regex.MalformedPatternException; import org.apache.oro.text.regex.Perl5Compiler; Copied: james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java (from r684466, james/server/trunk/user-library/src/main/java/org/apache/james/util/VirtualUserTableUtil.java) URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/util/VirtualUserTableUtil.java&r1=684466&r2=684480&rev=684480&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/util/VirtualUserTableUtil.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/VirtualUserTableUtil.java Sun Aug 10 05:10:16 2008 @@ -19,7 +19,7 @@ -package org.apache.james.util; +package org.apache.james.vut; import java.util.ArrayList; import java.util.Collection; @@ -29,6 +29,7 @@ import java.util.StringTokenizer; import org.apache.james.api.vut.VirtualUserTable; +import org.apache.james.util.XMLResources; import org.apache.mailet.MailAddress; import org.apache.oro.text.regex.MalformedPatternException; import org.apache.oro.text.regex.MatchResult; 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=684480&r1=684479&r2=684480&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 05:10:16 2008 @@ -28,7 +28,7 @@ import org.apache.james.api.user.InvalidMappingException; import org.apache.james.api.vut.VirtualUserTable; import org.apache.james.services.VirtualUserTableManagement; -import org.apache.james.util.VirtualUserTableUtil; +import org.apache.james.vut.VirtualUserTableUtil; public class MockVirtualUserTableManagementImpl implements VirtualUserTableManagement { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]