[hibernate-commits] Hibernate SVN: r17827 - in core/trunk/entitymanager: src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar and 8 other directories.

Author: hardy.ferentschik Date: 2009-10-23 10:32:18 -0400 (Fri, 23 Oct 2009) New Revision: 17827 Modified: core/trunk/entitymanager/pom.xml core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java Log: HHH-4523 - made the bundles use the filtered connection settings Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/pom.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -146,7 +146,7 @@ <property name="package.dir" value="${basedir}/target/test-packages" /> <property name="package.tmp.dir" value="${basedir}/target/tmp" /> <property name="classes.dir" value="${project.build.directory}/test-classes" /> - <property name="testresources.dir" value="${basedir}/src/test/bundles" /> + <property name="testresources.dir" value="${basedir}/target/bundles" /> <ant antfile="${basedir}/build.xml"> <target name="package" /> </ant> Modified: core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -4,11 +4,11 @@ <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.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: core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -7,11 +7,11 @@ <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.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> </properties> Modified: core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -7,11 +7,11 @@ <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.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> <property name="hibernate.archive.autodetection" value="class"/> Modified: core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -12,11 +12,11 @@ <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.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: core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -7,11 +7,11 @@ <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.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> </properties> Modified: core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -6,11 +6,11 @@ version="1.0"> <persistence-unit name="space par"> <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.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> </properties> Modified: core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml =================================================================== --- core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml 2009-10-23 14:32:18 UTC (rev 17827) @@ -7,11 +7,11 @@ <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.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> </properties> Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2009-10-23 13:48:18 UTC (rev 17826) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2009-10-23 14:32:18 UTC (rev 17827) @@ -1,3 +1,4 @@ +//$Id$ package org.hibernate.ejb.test; import java.util.HashMap; @@ -28,8 +29,6 @@ import org.hibernate.event.EventListeners; import org.hibernate.stat.Statistics; -//$Id$ - /** * @author Gavin King */