Author: eric
Date: Thu Oct 21 09:48:52 2010
New Revision: 1025915
URL: http://svn.apache.org/viewvc?rev=1025915&view=rev
Log:
Align packages hierarchy for user/vut service - jdbc part (JAMES1074)
Added:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/
- copied from r1025912,
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java
- copied, changed from r1025912,
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/
james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/
- copied from r1025912,
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java
- copied, changed from r1025912,
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
Removed:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/ListUsersJdbcRepositoryTest.java
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=1025915&r1=1025912&r2=1025915&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 Oct 21 09:48:52 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java?rev=1025915&r1=1025912&r2=1025915&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
Thu Oct 21 09:48:52 2010
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.james.user.api.User;
import org.apache.james.user.lib.DefaultUser;
@@ -52,7 +52,7 @@ public class DefaultUsersJdbcRepository
}
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
*/
protected User readUserFromResultSet(ResultSet rsUsers) throws
SQLException
{
@@ -65,7 +65,7 @@ public class DefaultUsersJdbcRepository
}
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
PreparedStatement userInsert)
@@ -78,7 +78,7 @@ public class DefaultUsersJdbcRepository
}
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
*/
protected void setUserForUpdateStatement(User user,
PreparedStatement userUpdate)
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java?rev=1025915&r1=1025912&r2=1025915&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
Thu Oct 21 09:48:52 2010
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.james.user.api.User;
import org.apache.james.user.lib.DefaultJamesUser;
@@ -37,7 +37,7 @@ import java.sql.SQLException;
public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository {
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
*/
protected User readUserFromResultSet(ResultSet rsUsers) throws
SQLException {
// Get the column values
@@ -75,7 +75,7 @@ public class JamesUsersJdbcRepository ex
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
* java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
@@ -84,7 +84,7 @@ public class JamesUsersJdbcRepository ex
}
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.User,
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.User,
* java.sql.PreparedStatement)
*/
protected void setUserForUpdateStatement(User user,
Modified:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java?rev=1025915&r1=1025912&r2=1025915&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
Thu Oct 21 09:48:52 2010
@@ -19,7 +19,7 @@
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.james.user.api.User;
import org.apache.james.user.lib.DefaultUser;
@@ -48,7 +48,7 @@ public class ListUsersJdbcRepository ext
}
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
*/
protected User readUserFromResultSet(ResultSet rsUsers) throws
SQLException {
// Get the username, and build a DefaultUser with it.
@@ -58,7 +58,7 @@ public class ListUsersJdbcRepository ext
}
/**
- * @see
org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
+ * @see
org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
PreparedStatement userInsert)
Copied:
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java
(from r1025912,
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java?p2=james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java&p1=james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java&r1=1025912&r2=1025915&rev=1025915&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
(original)
+++
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java
Thu Oct 21 09:48:52 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.vut;
+package org.apache.james.vut.jdbc;
import java.io.InputStream;
import java.sql.Connection;
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=1025915&r1=1025912&r2=1025915&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 Oct 21 09:48:52 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
@@ -25,6 +25,8 @@ import org.apache.commons.logging.impl.S
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.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;
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=1025915&r1=1025912&r2=1025915&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 Oct 21 09:48:52 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
@@ -27,6 +27,8 @@ import org.apache.james.lifecycle.Lifecy
import org.apache.james.services.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;
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=1025915&r1=1025912&r2=1025915&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 Oct 21 09:48:52 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.user.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
@@ -25,6 +25,8 @@ import org.apache.commons.logging.impl.S
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.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;
Copied:
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java
(from r1025912,
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java?p2=james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java&p1=james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java&r1=1025912&r2=1025915&rev=1025915&view=diff
==============================================================================
---
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
(original)
+++
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java
Thu Oct 21 09:48:52 2010
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.vut;
+package org.apache.james.vut.jdbc;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.jdbc.JDBCVirtualUserTable;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
import org.apache.james.vut.lib.AbstractVirtualUserTableTest;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
