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 er...@apache.org on 2010/09/10 10:57:06 UTC
svn commit: r995707 - in /james/server/trunk: core-function/
core-function/src/main/java/org/apache/james/domain/
core-function/src/main/java/org/apache/james/domain/model/
core-function/src/test/java/org/apache/james/domain/
spring-deployment/src/main...
Author: eric
Date: Fri Sep 10 08:57:05 2010
New Revision: 995707
URL: http://svn.apache.org/viewvc?rev=995707&view=rev
Log:
Move JPAUser and JPADomain to model sub-package for consistency
Added:
james/server/trunk/core-function/src/main/java/org/apache/james/domain/model/
james/server/trunk/core-function/src/main/java/org/apache/james/domain/model/JPADomain.java
- copied, changed from r995696, james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomain.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JCRUser.java
- copied, changed from r995696, james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUser.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JPAUser.java
- copied, changed from r995696, james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java
Removed:
james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomain.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUser.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java
Modified:
james/server/trunk/core-function/pom.xml
james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomainList.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/JPADomainListTest.java
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
james/server/trunk/user-function/pom.xml
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
Modified: james/server/trunk/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Fri Sep 10 08:57:05 2010
@@ -139,7 +139,7 @@
<artifactId>openjpa-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
- <includes>org/apache/james/domain/JPADomain.class</includes>
+ <includes>org/apache/james/domain/model/JPADomain.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
<toolProperties>
@@ -149,7 +149,7 @@
</property>
<property>
<name>metaDataFactory</name>
- <value>jpa(Types=org.apache.james.domain.JPADomain)</value>
+ <value>jpa(Types=org.apache.james.domain.model.JPADomain)</value>
</property>
</toolProperties>
</configuration>
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomainList.java?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomainList.java Fri Sep 10 08:57:05 2010
@@ -29,6 +29,7 @@ import javax.persistence.PersistenceUnit
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.domain.model.JPADomain;
import org.apache.james.lifecycle.Configurable;
/**
Copied: james/server/trunk/core-function/src/main/java/org/apache/james/domain/model/JPADomain.java (from r995696, james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomain.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/model/JPADomain.java?p2=james/server/trunk/core-function/src/main/java/org/apache/james/domain/model/JPADomain.java&p1=james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomain.java&r1=995696&r2=995707&rev=995707&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/JPADomain.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/model/JPADomain.java Fri Sep 10 08:57:05 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.domain;
+package org.apache.james.domain.model;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/domain/JPADomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/domain/JPADomainListTest.java?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/domain/JPADomainListTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/domain/JPADomainListTest.java Fri Sep 10 08:57:05 2010
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.domain.model.JPADomain;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;
Modified: james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml Fri Sep 10 08:57:05 2010
@@ -28,13 +28,13 @@
<class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
<!-- UsersRepository -->
- <class>org.apache.james.userrepository.JPAUser</class>
+ <class>org.apache.james.userrepository.model.JPAUser</class>
<!-- DomainList -->
- <class>org.apache.james.domain.JPADomain</class>
+ <class>org.apache.james.domain.model.JPADomain</class>
<!-- VirtualUser -->
- <class>org.apache.james.vut.model.JPAVirtualUser</class>
+ <class>org.apache.james.vut.model.model.JPAVirtualUser</class>
<properties>
<!-- Create tables on startup -->
Modified: james/server/trunk/user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/pom.xml?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/user-function/pom.xml (original)
+++ james/server/trunk/user-function/pom.xml Fri Sep 10 08:57:05 2010
@@ -36,7 +36,7 @@
<artifactId>openjpa-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
- <includes>org/apache/james/userrepository/JPAUser.class,org/apache/james/vut/model/JPAVirtualUser.class</includes>
+ <includes>org/apache/james/userrepository/model/JPAUser.class,org/apache/james/vut/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.JPAUser;org.apache.james.vut.model.JPAVirtualUser)</value>
+ <value>jpa(Types=org.apache.james.userrepository.model.JPAUser;org.apache.james.vut.model.JPAVirtualUser)</value>
</property>
</toolProperties>
</configuration>
Modified: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java Fri Sep 10 08:57:05 2010
@@ -41,7 +41,7 @@ import org.apache.james.api.user.User;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
-
+import org.apache.james.userrepository.model.JCRUser;
/**
* {@link UsersRepository} implementation which stores users to a JCR {@link Repository}
Modified: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java Fri Sep 10 08:57:05 2010
@@ -36,6 +36,7 @@ import org.apache.james.api.user.User;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.userrepository.model.JPAUser;
/**
Copied: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JCRUser.java (from r995696, james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JCRUser.java?p2=james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JCRUser.java&p1=james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUser.java&r1=995696&r2=995707&rev=995707&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JCRUser.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JCRUser.java Fri Sep 10 08:57:05 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.userrepository.model;
import org.apache.jackrabbit.util.Text;
import org.apache.james.api.user.User;
@@ -27,7 +27,7 @@ import org.apache.james.api.user.User;
* Differs from standard James by improved hash.
* TODO: think about improving DefaultUser.
*/
-class JCRUser implements User {
+public class JCRUser implements User {
/**
* Static salt for hashing password.
Copied: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JPAUser.java (from r995696, james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JPAUser.java?p2=james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JPAUser.java&p1=james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java&r1=995696&r2=995707&rev=995707&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/model/JPAUser.java Fri Sep 10 08:57:05 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.userrepository;
+package org.apache.james.userrepository.model;
import javax.persistence.Basic;
import javax.persistence.Entity;
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java?rev=995707&r1=995706&r2=995707&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java Fri Sep 10 08:57:05 2010
@@ -25,9 +25,9 @@ import javax.persistence.PersistenceExce
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.user.UsersRepository;
-import org.apache.james.userrepository.JPAUser;
import org.apache.james.userrepository.JPAUsersRepository;
import org.apache.james.userrepository.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;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org