HHH-4777 HHH-4532 org.hibernate.ejb.test.PackagedEntityManagerTest.testOverridenPar() hard code hsqldb connection info

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18499 1b8cb986-b30d-0410-93ca-fae66ebed9b2

entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml

@@ -9,6 +9,7 @@
         <property name="hibernate.connection.username">${jdbc.user}</property>
         <property name="hibernate.connection.password">${jdbc.pass}</property>
         <property name="hibernate.connection.url">${jdbc.url}</property>
+        <property name="hibernate.connection.isolation">${jdbc.isolation}</property>
         <property name="hibernate.cache.use_query_cache">true</property>
         <property name="hibernate.cache.region_prefix">hibernate.test</property>
         <property name="hibernate.jdbc.use_streams_for_binary">true</property>

entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml

@@ -13,6 +13,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
         </properties>

entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml

@@ -12,6 +12,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
         </properties>

entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml

@@ -12,6 +12,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
             <property name="hibernate.archive.autodetection" value="class"/>

entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml

@@ -8,7 +8,9 @@
     <package>org.hibernate.ejb.test.pack.various</package>
     <entity class="Seat" access="PROPERTY" metadata-complete="true">
         <attributes>
-            <id name="number"/>
+            <id name="number">
+            	<column name="`number`" />
+            </id>
         </attributes>
     </entity>
 </entity-mappings>

entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml

@@ -17,6 +17,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.cache.use_query_cache" value="true"/>
             <property name="hibernate.cache.region_prefix" value="hibernate.test"/>
             <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>

entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml

@@ -12,6 +12,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
         </properties>

entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml

@@ -6,7 +6,7 @@
     <persistence-unit name="overridenpar">
         <jta-data-source>java:/unreachableDS</jta-data-source>
 		<properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+            <property name="hibernate.dialect" value="${db.dialect}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
         </properties>

entitymanager/src/test/bundles/space par/META-INF/persistence.xml

@@ -11,6 +11,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
         </properties>

entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml

@@ -12,6 +12,7 @@
             <property name="hibernate.connection.username" value="${jdbc.user}"/>
             <property name="hibernate.connection.password" value="${jdbc.pass}"/>
             <property name="hibernate.connection.url" value="${jdbc.url}"/>
+            <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
         </properties>

entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java

@@ -3,6 +3,8 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Properties;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
@@ -32,6 +34,7 @@
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.event.EventListeners;
 import org.hibernate.stat.Statistics;
+import org.hibernate.util.ConfigHelper;
 
 /**
  * @author Gavin King
@@ -230,10 +233,9 @@ public void testSpacePar() throws Exception {
 	public void testOverridenPar() throws Exception {
 		HashMap properties = new HashMap();
 		properties.put( HibernatePersistence.JTA_DATASOURCE, null );
-		properties.put( "hibernate.connection.driver_class", "org.hsqldb.jdbcDriver" );
+		Properties p=new Properties();
-		properties.put( "hibernate.connection.username", "sa" );
+		p.load( ConfigHelper.getResourceAsStream( "/overridenpar.properties" ) );
-		properties.put( "hibernate.connection.password", "" );
+		properties.putAll( p );
-		properties.put( "hibernate.connection.url", "jdbc:hsqldb:." );
 		EntityManagerFactory emf = Persistence.createEntityManagerFactory( "overridenpar", properties );
 		EntityManager em = emf.createEntityManager();
 		org.hibernate.ejb.test.pack.overridenpar.Bug bug = new org.hibernate.ejb.test.pack.overridenpar.Bug();

entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java

@@ -1,6 +1,7 @@
 //$Id$
 package org.hibernate.ejb.test.pack.overridenpar;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
@@ -14,6 +15,7 @@ public class Bug {
 	@GeneratedValue
 	private Long id;
 	private String subject;
+	@Column(name="`comment`")
 	private String comment;
 
 	public Long getId() {

entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java

@@ -1,6 +1,7 @@
 //$Id$
 package org.hibernate.ejb.test.pack.spacepar;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
@@ -14,6 +15,7 @@ public class Bug {
 	@GeneratedValue
 	private Long id;
 	private String subject;
+	@Column(name="`comment`")
 	private String comment;
 
 	public Long getId() {