[hibernate-commits] Hibernate SVN: r19532 - in core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate: bytecode/cglib and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-17 12:16:27 -0400 (Mon, 17 May 2010)
New Revision: 19532

Modified:
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java
Log:
JBPAPP-4330 deprecate cglib as hibernate byte code provider

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java	2010-05-17 15:40:29 UTC (rev 19531)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java	2010-05-17 16:16:27 UTC (rev 19532)
@@ -37,7 +37,7 @@
 /**
  * Strategy for performing build-time instrumentation of persistent classes in order to enable
  * field-level interception using CGLIB.
- *
+ * @deprecated
  * @author Steve Ebersole
  * @author Gavin King
  */

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java	2010-05-17 15:40:29 UTC (rev 19531)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java	2010-05-17 16:16:27 UTC (rev 19532)
@@ -39,7 +39,7 @@
 
 /**
  * Bytecode provider implementation for CGLIB.
- *
+ * @deprecated
  * @author Steve Ebersole
  */
 public class BytecodeProviderImpl implements BytecodeProvider {

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java	2010-05-17 15:40:29 UTC (rev 19531)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java	2010-05-17 16:16:27 UTC (rev 19532)
@@ -777,6 +777,7 @@
 			return new org.hibernate.bytecode.javassist.BytecodeProviderImpl();
 		}
 		else if ( "cglib".equals( providerName ) ) {
+			log.warn( "CGLIB is now deprecated, and will be removed in the furture" );
 			return new org.hibernate.bytecode.cglib.BytecodeProviderImpl();
 		}
 

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java	2010-05-17 15:40:29 UTC (rev 19531)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java	2010-05-17 16:16:27 UTC (rev 19532)
@@ -347,11 +347,12 @@
 			return new org.hibernate.bytecode.javassist.BytecodeProviderImpl();
 		}
 		else if ( "cglib".equals( providerName ) ) {
+			log.warn( "CGLIB is now deprecated, and will be removed in the furture" );
 			return new org.hibernate.bytecode.cglib.BytecodeProviderImpl();
 		}
 		else {
-			log.debug( "using cglib as bytecode provider by default" );
-			return new org.hibernate.bytecode.cglib.BytecodeProviderImpl();
+			log.debug( "using javassist as bytecode provider by default" );
+			return new org.hibernate.bytecode.javassist.BytecodeProviderImpl();
 		}
 	}
 

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java	2010-05-17 15:40:29 UTC (rev 19531)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java	2010-05-17 16:16:27 UTC (rev 19532)
@@ -89,7 +89,7 @@
 			}
 			if ( !JTAHelper.isInProgress( txn.getStatus() ) ) {
 				// We could register the session against the transaction even though it is
-				// not started, but we'd have no guarentee of ever getting the map
+				// not started, but we'd have no guarantee of ever getting the map
 				// entries cleaned up (aside from spawning threads).
 				throw new HibernateException( "Current transaction is not in progress" );
 			}