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 no...@apache.org on 2010/12/16 14:49:49 UTC
svn commit: r1049974 [3/3] - in /james/server/trunk: ./ container-spring/
container-spring/src/main/java/org/apache/james/container/spring/
container-spring/src/main/java/org/apache/james/container/spring/lifecycle/
core-api/src/main/java/org/apache/ja...
Modified: james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java Thu Dec 16 13:49:44 2010
@@ -29,10 +29,10 @@ import java.util.Iterator;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.repository.file.FilePersistentObjectRepository;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.user.api.JamesUser;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.file.UsersFileRepository;
Modified: james/server/trunk/user-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jcr/pom.xml (original)
+++ james/server/trunk/user-jcr/pom.xml Thu Dec 16 13:49:44 2010
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java (original)
+++ james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java Thu Dec 16 13:49:44 2010
@@ -37,8 +37,8 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.util.Text;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jcr.model.JCRUser;
Modified: james/server/trunk/user-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/pom.xml (original)
+++ james/server/trunk/user-jdbc/pom.xml Thu Dec 16 13:49:44 2010
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-resolver-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
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=1049974&r1=1049973&r2=1049974&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 Thu Dec 16 13:49:44 2010
@@ -21,7 +21,7 @@ package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.user.api.User;
import org.apache.james.user.lib.AbstractJamesUsersRepository;
import org.apache.james.util.sql.JDBCUtil;
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java Thu Dec 16 13:49:44 2010
@@ -36,7 +36,7 @@ import javax.sql.DataSource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java Thu Dec 16 13:49:44 2010
@@ -21,14 +21,15 @@ package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.MockFileSystem;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.resolver.api.mock.MockFileSystem;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jdbc.AbstractJdbcUsersRepository;
import org.apache.james.user.jdbc.DefaultUsersJdbcRepository;
import org.apache.james.user.lib.MockUsersRepositoryTest;
-import org.apache.james.util.TestUtil;
import java.util.Iterator;
@@ -60,7 +61,7 @@ public class DefaultUsersJdbcRepositoryT
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- DataSource dataSource = TestUtil.getDataSource();
+ DataSource dataSource = getDataSource();
res.setDatasource(dataSource );
@@ -72,6 +73,16 @@ public class DefaultUsersJdbcRepositoryT
res.init();
}
+
+ private BasicDataSource getDataSource() {
+ BasicDataSource ds = new BasicDataSource();
+ ds.setDriverClassName(EmbeddedDriver.class.getName());
+ ds.setUrl("jdbc:derby:target/testdb;create=true");
+ ds.setUsername("james");
+ ds.setPassword("james");
+ return ds;
+ }
+
/**
* @return
*/
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java Thu Dec 16 13:49:44 2010
@@ -22,15 +22,16 @@ package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.MockFileSystem;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.resolver.api.mock.MockFileSystem;
import org.apache.james.user.api.JamesUser;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jdbc.AbstractJdbcUsersRepository;
import org.apache.james.user.jdbc.JamesUsersJdbcRepository;
import org.apache.james.user.lib.MockUsersRepositoryTest;
-import org.apache.james.util.TestUtil;
import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.MailAddress;
@@ -65,7 +66,7 @@ public class JamesUsersJdbcRepositoryTes
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- DataSource dataSource = TestUtil.getDataSource();
+ DataSource dataSource = getDataSource();
res.setDatasource(dataSource );
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
@@ -75,6 +76,16 @@ public class JamesUsersJdbcRepositoryTes
res.init();
}
+
+ private BasicDataSource getDataSource() {
+ BasicDataSource ds = new BasicDataSource();
+ ds.setDriverClassName(EmbeddedDriver.class.getName());
+ ds.setUrl("jdbc:derby:target/testdb;create=true");
+ ds.setUsername("james");
+ ds.setPassword("james");
+ return ds;
+ }
+
/**
* @return
*/
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/ListUsersJdbcRepositoryTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/ListUsersJdbcRepositoryTest.java Thu Dec 16 13:49:44 2010
@@ -21,14 +21,15 @@ package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.MockFileSystem;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.resolver.api.mock.MockFileSystem;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jdbc.AbstractJdbcUsersRepository;
import org.apache.james.user.jdbc.ListUsersJdbcRepository;
import org.apache.james.user.lib.MockUsersRepositoryTest;
-import org.apache.james.util.TestUtil;
import java.util.Iterator;
@@ -69,7 +70,7 @@ public class ListUsersJdbcRepositoryTest
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- DataSource dataSource = TestUtil.getDataSource();
+ DataSource dataSource = getDataSource();
res.setDatasource(dataSource );
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
@@ -80,6 +81,16 @@ public class ListUsersJdbcRepositoryTest
res.init();
}
+
+ private BasicDataSource getDataSource() {
+ BasicDataSource ds = new BasicDataSource();
+ ds.setDriverClassName(EmbeddedDriver.class.getName());
+ ds.setUrl("jdbc:derby:target/testdb;create=true");
+ ds.setUsername("james");
+ ds.setPassword("james");
+ return ds;
+ }
+
protected void disposeUsersRepository() {
Iterator<String> i = this.usersRepository.list();
while (i.hasNext()) {
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java Thu Dec 16 13:49:44 2010
@@ -18,10 +18,13 @@
****************************************************************/
package org.apache.james.vut.jdbc;
+
+
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.services.MockFileSystem;
-import org.apache.james.util.TestUtil;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.james.resolver.api.mock.MockFileSystem;
import org.apache.james.vut.jdbc.JDBCVirtualUserTable;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
import org.apache.james.vut.lib.AbstractVirtualUserTableTest;
@@ -37,7 +40,7 @@ public class JDBCVirtualUserTableTest ex
protected AbstractVirtualUserTable getVirtualUserTable() throws Exception {
JDBCVirtualUserTable virtualUserTable = new JDBCVirtualUserTable();
virtualUserTable.setLog(new SimpleLog("MockLog"));
- virtualUserTable.setDataSource(TestUtil.getDataSource());
+ virtualUserTable.setDataSource(getDataSource());
virtualUserTable.setFileSystem(new MockFileSystem());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
defaultConfiguration.addProperty("[@destinationURL]","db://maildb/VirtualUserTable");
@@ -47,6 +50,15 @@ public class JDBCVirtualUserTableTest ex
return virtualUserTable;
}
+
+ private BasicDataSource getDataSource() {
+ BasicDataSource ds = new BasicDataSource();
+ ds.setDriverClassName(EmbeddedDriver.class.getName());
+ ds.setUrl("jdbc:derby:target/testdb;create=true");
+ ds.setUsername("james");
+ ds.setPassword("james");
+ return ds;
+ }
/**
* @see org.apache.james.vut.lib.AbstractVirtualUserTableTest#addMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
Modified: james/server/trunk/user-jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jpa/pom.xml (original)
+++ james/server/trunk/user-jpa/pom.xml Thu Dec 16 13:49:44 2010
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java (original)
+++ james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java Thu Dec 16 13:49:44 2010
@@ -33,8 +33,8 @@ import javax.persistence.PersistenceUnit
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jpa.model.JPAUser;
Modified: james/server/trunk/user-ldap/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-ldap/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-ldap/pom.xml (original)
+++ james/server/trunk/user-ldap/pom.xml Thu Dec 16 13:49:44 2010
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java (original)
+++ james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java Thu Dec 16 13:49:44 2010
@@ -38,8 +38,8 @@ import javax.naming.directory.SearchResu
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
Modified: james/server/trunk/user-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Thu Dec 16 13:49:44 2010
@@ -30,7 +30,11 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java Thu Dec 16 13:49:44 2010
@@ -24,8 +24,8 @@ package org.apache.james.user.lib;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.user.api.JamesUser;
import org.apache.james.user.api.JamesUsersRepository;
import org.apache.james.user.api.User;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java Thu Dec 16 13:49:44 2010
@@ -29,9 +29,9 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.services.InstanceFactory;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
+import org.apache.james.resolver.api.InstanceFactory;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java Thu Dec 16 13:49:44 2010
@@ -29,8 +29,8 @@ import javax.mail.internet.ParseExceptio
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.MailAddress;
import org.apache.oro.text.regex.MalformedPatternException;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java Thu Dec 16 13:49:44 2010
@@ -28,10 +28,10 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.Disposable;
-import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.services.InstanceFactory;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.Disposable;
+import org.apache.james.lifecycle.api.LogEnabled;
+import org.apache.james.resolver.api.InstanceFactory;
import org.apache.james.vut.api.VirtualUserTable;
public class JamesVirtualUserTable implements VirtualUserTable, Configurable, LogEnabled{
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java Thu Dec 16 13:49:44 2010
@@ -21,7 +21,7 @@ package org.apache.james.user.lib;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.lib.DefaultJamesUser;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java Thu Dec 16 13:49:44 2010
@@ -24,7 +24,7 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.vut.api.VirtualUserTable;
import org.apache.james.vut.api.VirtualUserTable.ErrorMappingException;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
Modified: james/server/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/util/pom.xml (original)
+++ james/server/trunk/util/pom.xml Thu Dec 16 13:49:44 2010
@@ -65,7 +65,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposableFileInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposableFileInputStream.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposableFileInputStream.java (original)
+++ james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposableFileInputStream.java Thu Dec 16 13:49:44 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.api.Disposable;
/**
* {@link FileInputStream} which offers a method to dispose the underlying {@link File}
Modified: james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposeOnCloseInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposeOnCloseInputStream.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposeOnCloseInputStream.java (original)
+++ james/server/trunk/util/src/main/java/org/apache/james/util/stream/DisposeOnCloseInputStream.java Thu Dec 16 13:49:44 2010
@@ -23,7 +23,7 @@ import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
/**
* {@link FilterInputStream} which dispose wrapped {@link InputStream} after close is called
*
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org