Author: eric
Date: Thu Oct 21 09:44:34 2010
New Revision: 1025912
URL: http://svn.apache.org/viewvc?rev=1025912&view=rev
Log:
Align packages hierarchy for user/vut service - jpa part (JAMES1074)
Added:
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
- copied, changed from r1025910,
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/
- copied from r1025910,
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/model/
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/JPAVirtualUserTable.java
- copied, changed from r1025910,
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/model/
- copied from r1025910,
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/model/
Removed:
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/model/
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/model/
Modified:
james/server/trunk/user-jpa/pom.xml
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/model/JPAVirtualUser.java
james/server/trunk/user-jpa/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
Modified: james/server/trunk/user-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/pom.xml?rev=1025912&r1=1025911&r2=1025912&view=diff
==============================================================================
--- james/server/trunk/user-jpa/pom.xml (original)
+++ james/server/trunk/user-jpa/pom.xml Thu Oct 21 09:44:34 2010
@@ -36,7 +36,7 @@
<artifactId>openjpa-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
-
<includes>org/apache/james/userrepository/model/JPAUser.class,org/apache/james/vut/model/JPAVirtualUser.class</includes>
+
<includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/vut/jpa/model/JPAVirtualUser.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
<toolProperties>
@@ -46,7 +46,7 @@
</property>
<property>
<name>metaDataFactory</name>
-
<value>jpa(Types=org.apache.james.userrepository.model.JPAUser;org.apache.james.vut.model.JPAVirtualUser)</value>
+
<value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.vut.jpa.model.JPAVirtualUser)</value>
</property>
</toolProperties>
</configuration>
Copied:
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
(from r1025910,
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java?p2=james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java&p1=james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java&r1=1025910&r2=1025912&rev=1025912&view=diff
==============================================================================
---
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java
(original)
+++
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
Thu Oct 21 09:44:34 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.user.jpa;
import java.util.ArrayList;
import java.util.Collections;
@@ -36,7 +36,7 @@ import org.apache.james.lifecycle.Config
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
-import org.apache.james.userrepository.model.JPAUser;
+import org.apache.james.user.jpa.model.JPAUser;
/**
Modified:
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java?rev=1025912&r1=1025910&r2=1025912&view=diff
==============================================================================
---
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
(original)
+++
james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
Thu Oct 21 09:44:34 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository.model;
+package org.apache.james.user.jpa.model;
import javax.persistence.Basic;
import javax.persistence.Entity;
Copied:
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/JPAVirtualUserTable.java
(from r1025910,
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/JPAVirtualUserTable.java?p2=james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/JPAVirtualUserTable.java&p1=james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java&r1=1025910&r2=1025912&rev=1025912&view=diff
==============================================================================
---
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
(original)
+++
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/JPAVirtualUserTable.java
Thu Oct 21 09:44:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.vut;
+package org.apache.james.vut.jpa;
import java.util.Collection;
import java.util.HashMap;
@@ -30,9 +30,9 @@ import javax.persistence.PersistenceExce
import javax.persistence.PersistenceUnit;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.jpa.model.JPAVirtualUser;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
import org.apache.james.vut.lib.VirtualUserTableUtil;
-import org.apache.james.vut.model.JPAVirtualUser;
/**
* Class responsible to implement the Virtual User Table in database with JPA
access.
Modified:
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/model/JPAVirtualUser.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/model/JPAVirtualUser.java?rev=1025912&r1=1025910&r2=1025912&view=diff
==============================================================================
---
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/model/JPAVirtualUser.java
(original)
+++
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/jpa/model/JPAVirtualUser.java
Thu Oct 21 09:44:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.vut.model;
+package org.apache.james.vut.jpa.model;
import java.io.Serializable;
Modified:
james/server/trunk/user-jpa/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java?rev=1025912&r1=1025911&r2=1025912&view=diff
==============================================================================
---
james/server/trunk/user-jpa/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
(original)
+++
james/server/trunk/user-jpa/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
Thu Oct 21 09:44:34 2010
@@ -23,8 +23,9 @@ import java.util.HashMap;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.jpa.JPAUsersRepository;
+import org.apache.james.user.jpa.model.JPAUser;
import org.apache.james.user.lib.MockUsersRepositoryTest;
-import org.apache.james.userrepository.model.JPAUser;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAEntityTransaction;
Modified:
james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java?rev=1025912&r1=1025911&r2=1025912&view=diff
==============================================================================
---
james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
(original)
+++
james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
Thu Oct 21 09:44:34 2010
@@ -23,9 +23,10 @@ import java.util.HashMap;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.jpa.JPAVirtualUserTable;
+import org.apache.james.vut.jpa.model.JPAVirtualUser;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
import org.apache.james.vut.lib.AbstractVirtualUserTableTest;
-import org.apache.james.vut.model.JPAVirtualUser;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
