[hibernate-commits] Hibernate SVN: r20129 - in core/branches/Branch_3_5/core/src/main/java/org/hibernate: proxy/pojo/cglib and 3 other directories.

Author: steve.ebersole(a)jboss.com Date: 2010-08-09 15:55:23 -0400 (Mon, 09 Aug 2010) New Revision: 20129 Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/SerializableProxy.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/javassist/InstrumentTask.java Log: HHH-5451 - deprecate cglib as bytecode provider Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -39,6 +39,8 @@ * which simply acts as an adpater to the {@link BulkBean} class. * * @author Steve Ebersole + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class AccessOptimizerAdapter implements ReflectionOptimizer.AccessOptimizer, Serializable { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -41,11 +41,16 @@ * Bytecode provider implementation for CGLIB. * * @author Steve Ebersole + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class BytecodeProviderImpl implements BytecodeProvider { - private static final Logger log = LoggerFactory.getLogger( BytecodeProviderImpl.class ); + public BytecodeProviderImpl() { + log.warn( "Per HHH-5451 support for cglib as a bytecode provider has been deprecated." ); + } + public ProxyFactoryFactory getProxyFactoryFactory() { return new ProxyFactoryFactoryImpl(); } Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -52,6 +52,8 @@ * This interface is then used by Hibernate for some optimizations. * * @author Emmanuel Bernard + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class CglibClassTransformer extends AbstractClassTransformerImpl { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -35,9 +35,11 @@ /** * The {@link ReflectionOptimizer.InstantiationOptimizer} implementation for CGLIB - * which simply acts as an adpater to the {@link FastClass} class. + * which simply acts as an adapter to the {@link FastClass} class. * * @author Steve Ebersole + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class InstantiationOptimizerAdapter implements ReflectionOptimizer.InstantiationOptimizer, Serializable { private FastClass fastClass; Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -45,6 +45,8 @@ * A factory for CGLIB-based {@link ProxyFactory} instances. * * @author Steve Ebersole + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class ProxyFactoryFactoryImpl implements ProxyFactoryFactory { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -32,6 +32,8 @@ * ReflectionOptimizer implementation for CGLIB. * * @author Steve Ebersole + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class ReflectionOptimizerImpl implements ReflectionOptimizer, Serializable { private transient InstantiationOptimizerAdapter instantiationOptimizer; Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * 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 @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.proxy.pojo.cglib; @@ -46,6 +45,8 @@ /** * A <tt>LazyInitializer</tt> implemented using the CGLIB bytecode generation library + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public final class CGLIBLazyInitializer extends BasicLazyInitializer implements InvocationHandler { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * 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 @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.proxy.pojo.cglib; @@ -36,6 +35,8 @@ /** * @author Gavin King + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public class CGLIBProxyFactory implements ProxyFactory { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/SerializableProxy.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/SerializableProxy.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/proxy/pojo/cglib/SerializableProxy.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * 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 @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.proxy.pojo.cglib; @@ -34,6 +33,8 @@ /** * Serializable placeholder for <tt>CGLIB</tt> proxies + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated. */ public final class SerializableProxy extends AbstractSerializableProxy { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * 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 Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * 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 @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.tool.instrument.cglib; @@ -34,7 +33,7 @@ * field-level interception using CGLIB. * <p/> * In order to use this task, typically you would define a a taskdef - * similiar to:<pre> + * similar to:<pre> * <taskdef name="instrument" classname="org.hibernate.tool.instrument.cglib.InstrumentTask"> * <classpath refid="lib.class.path"/> * </taskdef> @@ -54,7 +53,7 @@ * instrumented. * <p/> * Optionally you can chose to enable "Extended Instrumentation" if desired - * by specifying the extended attriubute on the task:<pre> + * by specifying the extended attribute on the task:<pre> * <instrument extended="true"> * ... * </instrument> @@ -63,8 +62,15 @@ * * @author Gavin King * @author Steve Ebersole + * + * @deprecated Per HHH-5451 support for cglib as a bytecode provider has been deprecated; use + * {@link org.hibernate.tool.instrument.javassist.InstrumentTask} instead */ public class InstrumentTask extends BasicInstrumentationTask { + public InstrumentTask() { + System.err.println( "Per HHH-5451 support for cglib as a bytecode provider has been deprecated." ); + } + protected Instrumenter buildInstrumenter(Logger logger, Instrumenter.Options options) { return new CGLIBInstrumenter( logger, options ); } Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/javassist/InstrumentTask.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/javassist/InstrumentTask.java 2010-08-08 17:58:31 UTC (rev 20128) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/tool/instrument/javassist/InstrumentTask.java 2010-08-09 19:55:23 UTC (rev 20129) @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * 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 @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.tool.instrument.javassist;