[hibernate-commits] Hibernate SVN: r18831 - core/trunk/annotations/src/main/java/org/hibernate/cfg.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2010-02-18 04:59:16 -0500 (Thu, 18 Feb 2010)
New Revision: 18831

Modified:
   core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
   core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
Log:
HHH-4930 drop org. prefix on properties.

Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java	2010-02-18 09:29:30 UTC (rev 18830)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java	2010-02-18 09:59:16 UTC (rev 18831)
@@ -981,7 +981,7 @@
 
 	static void prepareDefaultCacheConcurrencyStrategy(Properties properties) {
 		if ( DEFAULT_CACHE_CONCURRENCY_STRATEGY != null ) {
-			log.info( "Default cache concurrency strategy already defined" );
+			log.trace( "Default cache concurrency strategy already defined" );
 			return;
 		}
 
@@ -998,7 +998,7 @@
 			return;
 		}
 
-		log.info( "Setting default cache concurrency strategy via config [" + strategy.name() + "]" );
+		log.debug( "Setting default cache concurrency strategy via config [" + strategy.name() + "]" );
 		DEFAULT_CACHE_CONCURRENCY_STRATEGY = strategy;
 	}
 

Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java	2010-02-18 09:29:30 UTC (rev 18830)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java	2010-02-18 09:59:16 UTC (rev 18831)
@@ -109,13 +109,14 @@
 	 * to use when either {@link javax.persistence.Cacheable @Cacheable} or
 	 * {@link Cache @Cache} is used.  {@link Cache @Cache(strategy="..")} is used to override.
 	 */
-	public static final String DEFAULT_CACHE_CONCURRENCY_STRATEGY = "org.hibernate.cache.default_cache_concurrency_strategy";
+	public static final String DEFAULT_CACHE_CONCURRENCY_STRATEGY = "hibernate.cache.default_cache_concurrency_strategy";
 
 	/**
-	 * Setting which indicates the Hibernate {@link org.hibernate.id.IdentifierGenerator} name to use as the mapping
-	 * for {@link javax.persistence.GenerationType#AUTO @GeneratedValue(strategy=AUTO...)}
+	 * Setting which indicates whether or not the new {@link org.hibernate.id.IdentifierGenerator} are used
+	 * for AUTO, TABLE and SEQUENCE.
+	 * Default to false to keep backward compatibility.
 	 */
-	public static final String USE_NEW_ID_GENERATOR_MAPPINGS = "org.hibernate.id.new_generator_mappings";
+	public static final String USE_NEW_ID_GENERATOR_MAPPINGS = "hibernate.id.new_generator_mappings";
 
 	/**
 	 * Class name of the class needed to enable Search.