Author: stliu Date: 2010-01-09 12:46:41 -0500 (Sat, 09 Jan 2010) New Revision: 18485 Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/defaultpar/META-INF/persistence.xml entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/excludehbmpar/META-INF/persistence.xml entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/persistence.xml entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explodedpar/META-INF/persistence.xml entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/META-INF/persistence.xml entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml entitymanager/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml Log: JBPAPP-3377 some EM test doesn't be tested on other DBs Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -4,11 +4,12 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.connection.url">jdbc:hsqldb:.</property> + <property name="hibernate.dialect">${db.dialect}</property> + <property name="hibernate.connection.driver_class">${jdbc.driver}</property> + <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> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/defaultpar/META-INF/persistence.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/defaultpar/META-INF/persistence.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/defaultpar/META-INF/persistence.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -7,11 +7,12 @@ <persistence-unit name="defaultpar"> <class>org.hibernate.ejb.test.pack.defaultpar.Lighter</class> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:."/> + <property name="hibernate.dialect" value="${db.dialect}"/> + <property name="hibernate.connection.driver_class" value="${jdbc.driver}"/> + <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> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/excludehbmpar/META-INF/persistence.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/excludehbmpar/META-INF/persistence.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/excludehbmpar/META-INF/persistence.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -7,11 +7,12 @@ <persistence-unit name="excludehbmpar" transaction-type="RESOURCE_LOCAL"> <mapping-file>META-INF/orm2.xml</mapping-file> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:."/> + <property name="hibernate.dialect" value="${db.dialect}"/> + <property name="hibernate.connection.driver_class" value="${jdbc.driver}"/> + <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"/> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/persistence.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/persistence.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/persistence.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -12,11 +12,12 @@ <class>org.hibernate.ejb.test</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:."/> + <property name="hibernate.dialect" value="${db.dialect}"/> + <property name="hibernate.connection.driver_class" value="${jdbc.driver}"/> + <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"/> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explodedpar/META-INF/persistence.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explodedpar/META-INF/persistence.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explodedpar/META-INF/persistence.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -7,11 +7,12 @@ <persistence-unit name="explodedpar" transaction-type="RESOURCE_LOCAL"> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:."/> + <property name="hibernate.dialect" value="${db.dialect}"/> + <property name="hibernate.connection.driver_class" value="${jdbc.driver}"/> + <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> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/META-INF/persistence.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/META-INF/persistence.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/META-INF/persistence.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -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> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -7,11 +7,12 @@ <persistence-unit name="defaultpar"> <class>org.hibernate.ejb.test.pack.defaultpar.Lighter</class> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:."/> + <property name="hibernate.dialect" value="${db.dialect}"/> + <property name="hibernate.connection.driver_class" value="${jdbc.driver}"/> + <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> Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml 2010-01-09 17:32:34 UTC (rev 18484) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml 2010-01-09 17:46:41 UTC (rev 18485) @@ -4,11 +4,12 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.connection.url">jdbc:hsqldb:.</property> + <property name="hibernate.dialect">${db.dialect}</property> + <property name="hibernate.connection.driver_class">${jdbc.driver}</property> + <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>