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/06/14 18:45:25 UTC
svn commit: r954550 - in /james/server/trunk: ./ jpa-store/
spring-deployment/ spring-deployment/src/main/config/james/ user-function/
user-function/src/main/java/org/apache/james/userrepository/
user-function/src/test/java/org/apache/james/userreposit...
Author: norman
Date: Mon Jun 14 16:45:24 2010
New Revision: 954550
URL: http://svn.apache.org/viewvc?rev=954550&view=rev
Log:
merge jpa-store to user-function there is no need to have this in an extra module
Added:
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java
- copied, changed from r954530, james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUser.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java
- copied, changed from r954530, james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUsersRepository.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java
- copied, changed from r954530, james/server/trunk/jpa-store/src/test/java/org/apache/james/server/jpa/JpaUsersRepositoryTest.java
Removed:
james/server/trunk/jpa-store/
Modified:
james/server/trunk/pom.xml
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/users-store.xml
james/server/trunk/user-function/pom.xml
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=954550&r1=954549&r2=954550&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Jun 14 16:45:24 2010
@@ -51,7 +51,6 @@
<module>mailets</module>
<module>fetchmail</module>
<module>jcr-store</module>
- <module>jpa-store</module>
<module>spring-deployment</module>
<module>netty-socket</module>
@@ -463,11 +462,6 @@
<artifactId>james-server-remotemanager</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-jpa-store</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=954550&r1=954549&r2=954550&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Mon Jun 14 16:45:24 2010
@@ -520,11 +520,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-jpa-store</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
Modified: james/server/trunk/spring-deployment/src/main/config/james/users-store.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/users-store.xml?rev=954550&r1=954549&r2=954550&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/users-store.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/users-store.xml Mon Jun 14 16:45:24 2010
@@ -71,7 +71,7 @@
<!-- JPA based backend. Support password algorithm are:
MD5, SHA-256, SHA-512, NONE
-->
- <repository name="LocalUsers" class="org.apache.james.server.jpa.JPAUsersRepository">
+ <repository name="LocalUsers" class="org.apache.james.userrepository.JPAUsersRepository">
<algorithm>MD5</algorithm>
</repository>
Modified: james/server/trunk/user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/pom.xml?rev=954550&r1=954549&r2=954550&view=diff
==============================================================================
--- james/server/trunk/user-function/pom.xml (original)
+++ james/server/trunk/user-function/pom.xml Mon Jun 14 16:45:24 2010
@@ -27,6 +27,49 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-function</artifactId>
<name>Apache JAMES Server User function</name>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <includes>org/apache/james/userrepository/JPAUser.class</includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ <toolProperties>
+ <property>
+ <name>log</name>
+ <value>TOOL=TRACE</value>
+ </property>
+ <property>
+ <name>metaDataFactory</name>
+ <value>jpa(Types=org.apache.james.userrepository.JPAUser)</value>
+ </property>
+ </toolProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -65,6 +108,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
@@ -72,7 +119,10 @@
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
@@ -98,6 +148,16 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Copied: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java (from r954530, james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java?p2=james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java&p1=james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUser.java&r1=954530&r2=954550&rev=954550&view=diff
==============================================================================
--- james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUser.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUser.java Mon Jun 14 16:45:24 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.server.jpa;
+package org.apache.james.userrepository;
import javax.persistence.Basic;
import javax.persistence.Entity;
Copied: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java (from r954530, james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java?p2=james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java&p1=james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUsersRepository.java&r1=954530&r2=954550&rev=954550&view=diff
==============================================================================
--- james/server/trunk/jpa-store/src/main/java/org/apache/james/server/jpa/JPAUsersRepository.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/JPAUsersRepository.java Mon Jun 14 16:45:24 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.server.jpa;
+package org.apache.james.userrepository;
import java.util.ArrayList;
import java.util.Collections;
Copied: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java (from r954530, james/server/trunk/jpa-store/src/test/java/org/apache/james/server/jpa/JpaUsersRepositoryTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java?p2=james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java&p1=james/server/trunk/jpa-store/src/test/java/org/apache/james/server/jpa/JpaUsersRepositoryTest.java&r1=954530&r2=954550&rev=954550&view=diff
==============================================================================
--- james/server/trunk/jpa-store/src/test/java/org/apache/james/server/jpa/JpaUsersRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JpaUsersRepositoryTest.java Mon Jun 14 16:45:24 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.server.jpa;
+package org.apache.james.userrepository;
import java.util.HashMap;
@@ -25,6 +25,8 @@ 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.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org