Author: eric
Date: Thu Jan 13 12:11:16 2011
New Revision: 1058527
URL: http://svn.apache.org/viewvc?rev=1058527&view=rev
Log:
Name JPA tables and columns (MAILBOX-14)
Modified:
james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
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
Modified:
james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java?rev=1058527&r1=1058526&r2=1058527&view=diff
==============================================================================
---
james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
(original)
+++
james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
Thu Jan 13 12:11:16 2011
@@ -30,7 +30,7 @@ import javax.persistence.Table;
*
*/
@Entity(name = "JamesDomain")
-@Table(name = "DOMAIN")
+@Table(name = "JAMES_DOMAIN")
@NamedQueries( {
@NamedQuery(name = "findDomainByName", query = "SELECT domain FROM
JamesDomain domain WHERE domain.name=:name"),
@NamedQuery(name = "containsDomain", query = "SELECT COUNT(domain) FROM
JamesDomain domain WHERE domain.name=:name") ,
@@ -43,7 +43,7 @@ public class JPADomain {
* The name of the domain. column name is chosen to be compatible with the
JDBCDomainList.
*/
@Id
- @Column(name = "DOMAIN", nullable = false, length = 100)
+ @Column(name = "DOMAIN_NAME", nullable = false, length = 100)
private String name;
/**
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=1058527&r1=1058526&r2=1058527&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 Jan 13 12:11:16 2011
@@ -20,16 +20,19 @@
package org.apache.james.user.jpa.model;
import javax.persistence.Basic;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.Table;
import javax.persistence.Version;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.james.user.api.model.User;
@Entity(name = "JamesUser")
+@Table(name = "JAMES_USER")
@NamedQueries( {
@NamedQuery(name = "findUserByName", query = "SELECT user FROM JamesUser
user WHERE user.name=:name"),
@NamedQuery(name = "deleteUserByName", query = "DELETE FROM JamesUser user
WHERE user.name=:name"),
@@ -72,12 +75,16 @@ public class JPAUser implements User {
/** Key by user name */
@Id
+ @Column(name = "USER_NAME", nullable = false, length = 100)
private String name;
+
/** Hashed password */
@Basic
+ @Column(name = "PASSWORD", nullable = false, length = 100)
private String password;
@Basic
+ @Column(name = "PASSWORD_HASH_ALGORITHM", nullable = false, length = 100)
private String alg;
protected JPAUser() {
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=1058527&r1=1058526&r2=1058527&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 Jan 13 12:11:16 2011
@@ -32,7 +32,7 @@ import javax.persistence.Table;
* VirtualUserTable class for the James Virtual User Table to be used for JPA
persistence.
*/
@Entity(name = "JamesVirtualUserTable")
-@Table(name = "VIRTUALUSERTABLE")
+@Table(name = "JAMES_VIRTUAL_USER_TABLE")
@NamedQueries( {
@NamedQuery(name = "selectMappings", query = "SELECT vut FROM
JamesVirtualUserTable vut WHERE (vut.user LIKE :user OR vut.user='*') and
(vut.domain like :domain or vut.domain='*') ORDER BY vut.domain DESC"),
@NamedQuery(name = "selectUserDomainMapping", query = "SELECT vut FROM
JamesVirtualUserTable vut WHERE vut.user=:user AND vut.domain=:domain"),
@@ -81,11 +81,9 @@ public class JPAVirtualUser {
/**
* The name of the user.
- * Column name is chosen to be compatible with the
JDBCVirtualUserTableList
- * (even if user will be probably translated by JPA to another name
(example: USER0).
*/
@Id
- @Column(name = "user", nullable = false, length = 64)
+ @Column(name = "USER_NAME", nullable = false, length = 100)
private String user = "";
/**
@@ -93,13 +91,13 @@ public class JPAVirtualUser {
* Column name is chosen to be compatible with the
JDBCVirtualUserTableList.
*/
@Id
- @Column(name = "DOMAIN", nullable = false, length = 255)
+ @Column(name = "DOMAIN_NAME", nullable = false, length = 100)
private String domain = "";
/**
* The target address. column name is chosen to be compatible with the
JDBCVirtualUserTableList.
*/
- @Column(name = "TARGET_ADDRESS", nullable = false, length = 255)
+ @Column(name = "TARGET_ADDRESS", nullable = false, length = 100)
private String targetAddress = "";
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
