From 7a230ae196bfdef963d02bfe976addf8516f7ebe Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Wed, 29 Feb 2012 00:06:29 +0800
Subject: [PATCH] Fix JPA problem

---
 TODO.txt                                             |  4 +---
 .../examples/miniweb/entity/account/User.java        |  2 +-
 .../miniweb/service/account/AccountManager.java      | 12 ------------
 .../mini-web/src/main/resources/META-INF/orm.xml     |  7 -------
 .../src/main/resources/META-INF/persistence.xml      |  7 -------
 .../src/main/resources/applicationContext.xml        |  1 +
 6 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index e9326d3f..b47273e2 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -8,9 +8,7 @@ TODO部分:
   * 引入Profile管理環境
   * 用Spring Data JPA代替BaseDao基类,清理Hibernate基类及相关
 	--GroupDao
-	--checkunique
-	--Column Naming (loginName)
-	--testcase, hibernateMapping
+	--same thing as hibernateMapping?
 
 
 2.次要改动
diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/account/User.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/account/User.java
index 31142d76..aa155874 100644
--- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/account/User.java
+++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/account/User.java
@@ -43,7 +43,7 @@ public class User extends IdEntity {
 	private List<Group> groupList = Lists.newArrayList();//有序的关联对象集合
 
 	//字段非空且唯一, 用于提醒Entity使用者及生成DDL.
-	@Column(name = "LOGIN_NAME", nullable = false, unique = true)
+	@Column(nullable = false, unique = true)
 	public String getLoginName() {
 		return loginName;
 	}
diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/account/AccountManager.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/account/AccountManager.java
index 300fdcd7..91ad3c94 100644
--- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/account/AccountManager.java
+++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/account/AccountManager.java
@@ -72,18 +72,6 @@ public class AccountManager {
 		return userDao.findByLoginName(loginName);
 	}
 
-	/**
-	 * 检查用户名是否唯一.
-	 *
-	 * @return newLoginName在数据库中唯一或等于oldLoginName时返回true.
-	 */
-	@Transactional(readOnly = true)
-	public boolean isLoginNameUnique(String newLoginName, String oldLoginName) {
-		return true;
-		//TODO
-		//return userDao.isPropertyUnique("loginName", newLoginName, oldLoginName);
-	}
-
 	//-- Group Manager --//
 	@Transactional(readOnly = true)
 	public Group getGroup(Long id) {
diff --git a/examples/mini-web/src/main/resources/META-INF/orm.xml b/examples/mini-web/src/main/resources/META-INF/orm.xml
index ea3c5031..9a2e1d95 100644
--- a/examples/mini-web/src/main/resources/META-INF/orm.xml
+++ b/examples/mini-web/src/main/resources/META-INF/orm.xml
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! (c) Copyright 2005-2012 JAXIO, www.jaxio.com
- ! Source code generated by Celerio, a Jaxio product
- ! Want to use Celerio within your company? email us at info@jaxio.com
- ! Follow us on twitter: @springfuse
- ! Template pack-backend-sd:src/main/resources/META-INF/orm.p.vm.xml
--->
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" version="2.0">
 </entity-mappings>
\ No newline at end of file
diff --git a/examples/mini-web/src/main/resources/META-INF/persistence.xml b/examples/mini-web/src/main/resources/META-INF/persistence.xml
index 99cd9219..ff96de22 100644
--- a/examples/mini-web/src/main/resources/META-INF/persistence.xml
+++ b/examples/mini-web/src/main/resources/META-INF/persistence.xml
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! (c) Copyright 2005-2012 JAXIO, www.jaxio.com
- ! Source code generated by Celerio, a Jaxio product
- ! Want to use Celerio within your company? email us at info@jaxio.com
- ! Follow us on twitter: @springfuse
- ! Template pack-backend-sd:src/main/resources/META-INF/persistence.p.vm.xml
--->
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="miniwebPU" transaction-type="RESOURCE_LOCAL">
diff --git a/examples/mini-web/src/main/resources/applicationContext.xml b/examples/mini-web/src/main/resources/applicationContext.xml
index 7dd79450..3423bbcb 100644
--- a/examples/mini-web/src/main/resources/applicationContext.xml
+++ b/examples/mini-web/src/main/resources/applicationContext.xml
@@ -30,6 +30,7 @@
 				<prop key="hibernate.dialect">${hibernate.dialect}</prop>
 				<prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>
 				<prop key="hibernate.cache.provider_configuration_file_resource_path">ehcache/ehcache-hibernate-local.xml</prop>
+				<prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
 			</props>
 		</property>
 	</bean>