[hibernate-commits] Hibernate SVN: r18233 - in annotations/branches/v3_4_0_GA_CP/src/test: java/org/hibernate/test/annotations/query and 1 other directories.

Author: stliu Date: 2009-12-16 03:05:35 -0500 (Wed, 16 Dec 2009) New Revision: 18233 Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java annotations/branches/v3_4_0_GA_CP/src/test/resources/hibernate.properties Log: JBPAPP-1679 Modify Annotations, Entity Manager, and Search to work with the same property settings as Core Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java 2009-12-16 07:49:27 UTC (rev 18232) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java 2009-12-16 08:05:35 UTC (rev 18233) @@ -6,6 +6,7 @@ import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.cfg.Configuration; import org.hibernate.criterion.Restrictions; import org.hibernate.metadata.ClassMetadata; import org.hibernate.stat.Statistics; @@ -88,6 +89,10 @@ s.close(); } + protected void configure(Configuration cfg) { + cfg.setProperty( "hibernate.cache.use_query_cache", "true" ); + } + protected Class[] getMappings() { return new Class[] { Citizen.class, State.class, NaturalIdOnManyToOne.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java 2009-12-16 07:49:27 UTC (rev 18232) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java 2009-12-16 08:05:35 UTC (rev 18233) @@ -6,6 +6,7 @@ import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.cfg.Configuration; import org.hibernate.criterion.Restrictions; import org.hibernate.metadata.ClassMetadata; import org.hibernate.stat.Statistics; @@ -28,6 +29,10 @@ int[] propertiesIndex = metaData.getNaturalIdentifierProperties(); assertTrue("Wrong number of elements", propertiesIndex.length == 2); } + + protected void configure(Configuration cfg) { + cfg.setProperty( "hibernate.cache.use_query_cache", "true" ); + } public void testNaturalIdCached() { saveSomeCitizens(); Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2009-12-16 07:49:27 UTC (rev 18232) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2009-12-16 08:05:35 UTC (rev 18233) @@ -9,6 +9,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.cfg.Configuration; import org.hibernate.stat.Statistics; import org.hibernate.test.annotations.A320; import org.hibernate.test.annotations.A320b; @@ -364,6 +365,10 @@ CasimirParticle.class }; } + + protected void configure(Configuration cfg) { + cfg.setProperty( "hibernate.cache.use_query_cache", "true" ); + } protected String[] getAnnotatedPackages() { return new String[]{ Modified: annotations/branches/v3_4_0_GA_CP/src/test/resources/hibernate.properties =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/hibernate.properties 2009-12-16 07:49:27 UTC (rev 18232) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/hibernate.properties 2009-12-16 08:05:35 UTC (rev 18233) @@ -1,24 +1,18 @@ -###################### -### Query Language ### -###################### - -## define query language constants / function names - -hibernate.query.substitutions true 1, false 0, yes 'Y', no 'N' - - -## select the classic query parser - -#hibernate.query.factory_class org.hibernate.hql.classic.ClassicQueryTranslatorFactory - -hibernate.format_sql true - - - -################# -### Platforms ### -################# - +################################################################################ +# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved. # +# # +# This copyrighted material is made available to anyone wishing to use, modify,# +# copy, or redistribute it subject to the terms and conditions of the GNU # +# Lesser General Public License, v. 2.1. This program is distributed in the # +# hope that it will be useful, but WITHOUT A WARRANTY; without even the implied# +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# Lesser General Public License for more details. You should have received a # +# copy of the GNU Lesser General Public License, v.2.1 along with this # +# distribution; if not, write to the Free Software Foundation, Inc., # +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# # +# Red Hat Author(s): Steve Ebersole # +################################################################################ hibernate.dialect ${db.dialect} hibernate.connection.driver_class ${jdbc.driver} hibernate.connection.url ${jdbc.url} @@ -26,278 +20,19 @@ hibernate.connection.password ${jdbc.pass} hibernate.connection.isolation ${jdbc.isolation} +hibernate.query.substitutions yes 'Y', no 'N' -################################# -### Hibernate Connection Pool ### -################################# - hibernate.connection.pool_size 1 -########################### -### C3P0 Connection Pool### -########################### - -#hibernate.c3p0.max_size 2 -#hibernate.c3p0.min_size 2 -#hibernate.c3p0.timeout 5000 -#hibernate.c3p0.max_statements 100 -#hibernate.c3p0.idle_test_period 3000 -#hibernate.c3p0.acquire_increment 2 -#hibernate.c3p0.validate false - -############################## -### Proxool Connection Pool### -############################## - -## Properties for external configuration of Proxool - hibernate.proxool.pool_alias pool1 -## Only need one of the following +hibernate.format_sql true -#hibernate.proxool.existing_pool true -#hibernate.proxool.xml proxool.xml -#hibernate.proxool.properties proxool.properties - - - -################################# -### Plugin ConnectionProvider ### -################################# - -## use a custom ConnectionProvider (if not set, Hibernate will choose a built-in ConnectionProvider using hueristics) - -#hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider - - - -####################### -### Transaction API ### -####################### - -## Enable automatic flush during the JTA beforeCompletion() callback -## (This setting is relevant with or without the Transaction API) - -#hibernate.transaction.flush_before_completion - - -## Enable automatic session close at the end of transaction -## (This setting is relevant with or without the Transaction API) - -#hibernate.transaction.auto_close_session - - -## the Transaction API abstracts application code from the underlying JTA or JDBC transactions - -#hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory -#hibernate.transaction.factory_class org.hibernate.transaction.JDBCTransactionFactory - - -## to use JTATransactionFactory, Hibernate must be able to locate the UserTransaction in JNDI -## default is java:comp/UserTransaction -## you do NOT need this setting if you specify hibernate.transaction.manager_lookup_class - -#jta.UserTransaction jta/usertransaction -#jta.UserTransaction javax.transaction.UserTransaction -#jta.UserTransaction UserTransaction - - -## to use the second-level cache with JTA, Hibernate must be able to obtain the JTA TransactionManager - -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WeblogicTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WebSphereTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.OrionTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.ResinTransactionManagerLookup - - - -############################## -### Miscellaneous Settings ### -############################## - -## print all generated SQL to the console - -#hibernate.show_sql true - - -## add comments to the generated SQL - -#hibernate.use_sql_comments true - - -## generate statistics - -#hibernate.generate_statistics true - - -## auto schema export - -#hibernate.hbm2ddl.auto create-drop -#hibernate.hbm2ddl.auto create -#hibernate.hbm2ddl.auto update - - -## specify a default schema and catalog for unqualified tablenames - -#hibernate.default_schema test -#hibernate.default_catalog test - - -## enable ordering of SQL UPDATEs by primary key - -hibernate.order_updates true - - -## set the maximum depth of the outer join fetch tree - hibernate.max_fetch_depth 1 - -## set the default batch size for batch fetching - -hibernate.default_batch_fetch_size 100 - - -## rollback generated identifier values of deleted entities to default values - -#hibernate.use_identifer_rollback true - - -## enable CGLIB reflection optimizer (enabled by default) - -#hibernate.cglib.use_reflection_optimizer false - - - -##################### -### JDBC Settings ### -##################### - -## specify a JDBC isolation level - -#hibernate.connection.isolation 4 - - -## enable JDBC autocommit (not recommended!) - -#hibernate.connection.autocommit true - - -## set the JDBC fetch size - -#hibernate.jdbc.fetch_size 25 - - -## set the maximum JDBC 2 batch size (a nonzero value enables batching) - -#hibernate.jdbc.batch_size 0 - - -## enable batch updates even for versioned data - hibernate.jdbc.batch_versioned_data true - -## enable use of JDBC 2 scrollable ResultSets (specifying a Dialect will cause Hibernate to use a sensible default) - -#hibernate.jdbc.use_scrollable_resultset true - - -## use streams when writing binary types to / from JDBC - hibernate.jdbc.use_streams_for_binary true - -## use JDBC 3 PreparedStatement.getGeneratedKeys() to get the identifier of an inserted row - -#hibernate.jdbc.use_get_generated_keys false - - -## choose a custom JDBC batcher - -# hibernate.jdbc.factory_class - - -## enable JDBC result set column alias caching -## (minor performance enhancement for broken JDBC drivers) - -# hibernate.jdbc.wrap_result_sets - - -## choose a custom SQL exception converter - -#hibernate.jdbc.sql_exception_converter - - - -########################## -### Second-level Cache ### -########################## - -## optimize chache for minimal "puts" instead of minimal "gets" (good for clustered cache) - -#hibernate.cache.use_minimal_puts true - - -## set a prefix for cache region names - hibernate.cache.region_prefix hibernate.test - - -## disable the second-level cache - -#hibernate.cache.use_second_level_cache false - - -## enable the query cache - -hibernate.cache.use_query_cache true - - -## store the second-level cache entries in a more human-friendly format - -#hibernate.cache.use_structured_entries true - - -## choose a cache implementation - -#hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.EmptyCacheProvider hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.TreeCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.OSCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.SwarmCacheProvider - - -## choose a custom query cache implementation - -#hibernate.cache.query_cache_factory - - - -############ -### JNDI ### -############ - -## specify a JNDI name for the SessionFactory - -#hibernate.session_factory_name hibernate/session_factory - - -## Hibernate uses JNDI to bind a name to a SessionFactory and to look up the JTA UserTransaction; -## if hibernate.jndi.* are not specified, Hibernate will use the default InitialContext() which -## is the best approach in an application server - -#file system -#hibernate.jndi.class com.sun.jndi.fscontext.RefFSContextFactory -#hibernate.jndi.url file:/ - -#WebSphere -#hibernate.jndi.class com.ibm.websphere.naming.WsnInitialContextFactory -#hibernate.jndi.url iiop://localhost:900/ -