Merge pull request #20 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0

* commit 'fbe5260c2b14c703cdd0e8f747b488c7cf40a1c1':
  hibernate使用改过包名的javassist
  druid使用改过包名的hsql问题

fine-druid/src/com/fr/third/alibaba/druid/util/JdbcUtils.java

@@ -401,7 +401,12 @@ public final class JdbcUtils implements JdbcConstants {
         } else if (rawUrl.startsWith("jdbc:odps:")) {
             return ODPS_DRIVER;
         } else if (rawUrl.startsWith("jdbc:hsqldb:")) {
-            return "org.hsqldb.jdbcDriver";
+            try {
+                Class.forName("com.fr.third.org.hsqldb.jdbcDriver");
+                return "com.fr.third.org.hsqldb.jdbcDriver";
+            } catch (Throwable ignore) {
+                return "org.hsqldb.jdbcDriver";
+            }
         } else if (rawUrl.startsWith("jdbc:db2:")) {
             return DB2_DRIVER;
         } else if (rawUrl.startsWith("jdbc:sqlite:")) {

fine-hibernate/src/com/fr/third/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java

@@ -14,8 +14,8 @@ import com.fr.third.javax.persistence.Embeddable;
 import com.fr.third.javax.persistence.Entity;
 import com.fr.third.javax.persistence.MappedSuperclass;
 
-import javassist.bytecode.AnnotationsAttribute;
+import com.fr.third.javassist.bytecode.AnnotationsAttribute;
-import javassist.bytecode.ClassFile;
+import com.fr.third.javassist.bytecode.ClassFile;
 
 import com.fr.third.org.hibernate.boot.archive.scan.internal.ClassDescriptorImpl;
 import com.fr.third.org.hibernate.boot.archive.scan.internal.ScanResultCollector;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/AttributeTypeDescriptor.java

@@ -11,9 +11,9 @@ import java.util.Locale;
 import com.fr.third.javax.persistence.EmbeddedId;
 import com.fr.third.javax.persistence.Id;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.NotFoundException;
+import com.fr.third.javassist.NotFoundException;
 
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancerConstants;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/CompositeEnhancer.java

@@ -6,8 +6,8 @@
  */
 package com.fr.third.org.hibernate.bytecode.enhance.internal;
 
-import javassist.CannotCompileException;
+import com.fr.third.javassist.CannotCompileException;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
 import com.fr.third.org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancerConstants;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/EntityEnhancer.java

@@ -13,12 +13,12 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import javassist.CannotCompileException;
+import com.fr.third.javassist.CannotCompileException;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.Modifier;
+import com.fr.third.javassist.Modifier;
 
-import javassist.NotFoundException;
+import com.fr.third.javassist.NotFoundException;
 import com.fr.third.org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker;
 import com.fr.third.org.hibernate.bytecode.enhance.internal.tracker.SimpleCollectionTracker;
 import com.fr.third.org.hibernate.bytecode.enhance.internal.tracker.SimpleFieldTracker;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/FieldWriter.java

@@ -8,13 +8,13 @@ package com.fr.third.org.hibernate.bytecode.enhance.internal;
 
 import com.fr.third.javax.persistence.Transient;
 
-import javassist.CannotCompileException;
+import com.fr.third.javassist.CannotCompileException;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.Modifier;
+import com.fr.third.javassist.Modifier;
-import javassist.bytecode.AnnotationsAttribute;
+import com.fr.third.javassist.bytecode.AnnotationsAttribute;
-import javassist.bytecode.FieldInfo;
+import com.fr.third.javassist.bytecode.FieldInfo;
-import javassist.bytecode.annotation.Annotation;
+import com.fr.third.javassist.bytecode.annotation.Annotation;
 
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementException;
 import com.fr.third.org.hibernate.internal.CoreLogging;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/MappedSuperclassEnhancer.java

@@ -6,9 +6,9 @@
  */
 package com.fr.third.org.hibernate.bytecode.enhance.internal;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.CtMethod;
+import com.fr.third.javassist.CtMethod;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 import com.fr.third.org.hibernate.engine.spi.ManagedMappedSuperclass;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/MethodWriter.java

@@ -6,13 +6,13 @@
  */
 package com.fr.third.org.hibernate.bytecode.enhance.internal;
 
-import javassist.CannotCompileException;
+import com.fr.third.javassist.CannotCompileException;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.CtMethod;
+import com.fr.third.javassist.CtMethod;
-import javassist.CtNewMethod;
+import com.fr.third.javassist.CtNewMethod;
-import javassist.NotFoundException;
+import com.fr.third.javassist.NotFoundException;
-import javassist.bytecode.ConstPool;
+import com.fr.third.javassist.bytecode.ConstPool;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementException;
 import com.fr.third.org.hibernate.internal.CoreLogging;
 import com.fr.third.org.hibernate.internal.CoreMessageLogger;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/PersistentAttributesEnhancer.java

@@ -20,19 +20,19 @@ import com.fr.third.javax.persistence.ManyToOne;
 import com.fr.third.javax.persistence.OneToMany;
 import com.fr.third.javax.persistence.OneToOne;
 
-import javassist.CannotCompileException;
+import com.fr.third.javassist.CannotCompileException;
-import javassist.ClassPool;
+import com.fr.third.javassist.ClassPool;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.CtMethod;
+import com.fr.third.javassist.CtMethod;
-import javassist.Modifier;
+import com.fr.third.javassist.Modifier;
-import javassist.NotFoundException;
+import com.fr.third.javassist.NotFoundException;
-import javassist.bytecode.BadBytecode;
+import com.fr.third.javassist.bytecode.BadBytecode;
-import javassist.bytecode.CodeIterator;
+import com.fr.third.javassist.bytecode.CodeIterator;
-import javassist.bytecode.ConstPool;
+import com.fr.third.javassist.bytecode.ConstPool;
-import javassist.bytecode.MethodInfo;
+import com.fr.third.javassist.bytecode.MethodInfo;
-import javassist.bytecode.Opcode;
+import com.fr.third.javassist.bytecode.Opcode;
-import javassist.bytecode.stackmap.MapMaker;
+import com.fr.third.javassist.bytecode.stackmap.MapMaker;
 
 import com.fr.third.org.hibernate.Hibernate;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementContext;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/internal/PersistentAttributesHelper.java

@@ -17,13 +17,13 @@ import com.fr.third.javax.persistence.ManyToOne;
 import com.fr.third.javax.persistence.OneToMany;
 import com.fr.third.javax.persistence.OneToOne;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
-import javassist.CtMember;
+import com.fr.third.javassist.CtMember;
-import javassist.CtMethod;
+import com.fr.third.javassist.CtMethod;
-import javassist.NotFoundException;
+import com.fr.third.javassist.NotFoundException;
-import javassist.bytecode.BadBytecode;
+import com.fr.third.javassist.bytecode.BadBytecode;
-import javassist.bytecode.SignatureAttribute;
+import com.fr.third.javassist.bytecode.SignatureAttribute;
 
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import com.fr.third.org.hibernate.internal.CoreLogging;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java

@@ -14,8 +14,8 @@ import com.fr.third.javax.persistence.MappedSuperclass;
 import com.fr.third.javax.persistence.OneToMany;
 import com.fr.third.javax.persistence.Transient;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
 
 /**
  * default implementation of EnhancementContext. May be sub-classed as needed.

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/spi/EnhancementContext.java

@@ -6,8 +6,8 @@
  */
 package com.fr.third.org.hibernate.bytecode.enhance.spi;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
 
 /**
  * The context for performing an enhancement.  Enhancement can happen in any number of ways:<ul>

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/enhance/spi/Enhancer.java

@@ -12,11 +12,11 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javassist.ClassPool;
+import com.fr.third.javassist.ClassPool;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.LoaderClassPath;
+import com.fr.third.javassist.LoaderClassPath;
 
-import javassist.NotFoundException;
+import com.fr.third.javassist.NotFoundException;
 import com.fr.third.org.hibernate.HibernateException;
 import com.fr.third.org.hibernate.bytecode.enhance.internal.CompositeEnhancer;
 import com.fr.third.org.hibernate.bytecode.enhance.internal.EntityEnhancer;

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/internal/javassist/BulkAccessorFactory.java

@@ -10,17 +10,17 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.security.ProtectionDomain;
 
-import javassist.CannotCompileException;
+import com.fr.third.javassist.CannotCompileException;
-import javassist.bytecode.AccessFlag;
+import com.fr.third.javassist.bytecode.AccessFlag;
-import javassist.bytecode.Bytecode;
+import com.fr.third.javassist.bytecode.Bytecode;
-import javassist.bytecode.ClassFile;
+import com.fr.third.javassist.bytecode.ClassFile;
-import javassist.bytecode.CodeAttribute;
+import com.fr.third.javassist.bytecode.CodeAttribute;
-import javassist.bytecode.ConstPool;
+import com.fr.third.javassist.bytecode.ConstPool;
-import javassist.bytecode.MethodInfo;
+import com.fr.third.javassist.bytecode.MethodInfo;
-import javassist.bytecode.Opcode;
+import com.fr.third.javassist.bytecode.Opcode;
-import javassist.bytecode.StackMapTable;
+import com.fr.third.javassist.bytecode.StackMapTable;
-import javassist.util.proxy.FactoryHelper;
+import com.fr.third.javassist.util.proxy.FactoryHelper;
-import javassist.util.proxy.RuntimeSupport;
+import com.fr.third.javassist.util.proxy.RuntimeSupport;
 
 /**
  * A factory of bulk accessors.

fine-hibernate/src/com/fr/third/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java

@@ -9,9 +9,9 @@ package com.fr.third.org.hibernate.bytecode.internal.javassist;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 
-import javassist.util.proxy.MethodFilter;
+import com.fr.third.javassist.util.proxy.MethodFilter;
-import javassist.util.proxy.MethodHandler;
+import com.fr.third.javassist.util.proxy.MethodHandler;
-import javassist.util.proxy.Proxy;
+import com.fr.third.javassist.util.proxy.Proxy;
 
 import com.fr.third.org.hibernate.AssertionFailure;
 import com.fr.third.org.hibernate.HibernateException;
@@ -59,7 +59,7 @@ public class ProxyFactoryFactoryImpl implements ProxyFactoryFactory {
 				throw new AssertionFailure( "attempting to build proxy without any superclass or interfaces" );
 			}
 
-			final javassist.util.proxy.ProxyFactory factory = new javassist.util.proxy.ProxyFactory();
+			final com.fr.third.javassist.util.proxy.ProxyFactory factory = new com.fr.third.javassist.util.proxy.ProxyFactory();
 			factory.setFilter( FINALIZE_FILTER );
 			if ( superClass != null ) {
 				factory.setSuperclass( superClass );

fine-hibernate/src/com/fr/third/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java

@@ -22,8 +22,8 @@ import com.fr.third.javax.persistence.PersistenceException;
 import com.fr.third.javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.sql.DataSource;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
 
 import com.fr.third.org.hibernate.Interceptor;
 import com.fr.third.org.hibernate.SessionFactory;

fine-hibernate/src/com/fr/third/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java

@@ -9,8 +9,8 @@ package com.fr.third.org.hibernate.jpa.internal.enhance;
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
-import javassist.CtField;
+import com.fr.third.javassist.CtField;
 
 import com.fr.third.org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.Enhancer;

fine-hibernate/src/com/fr/third/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import javassist.util.proxy.MethodHandler;
+import com.fr.third.javassist.util.proxy.MethodHandler;
 
 import com.fr.third.org.hibernate.engine.spi.SessionImplementor;
 import com.fr.third.org.hibernate.internal.CoreMessageLogger;

fine-hibernate/src/com/fr/third/org/hibernate/proxy/pojo/javassist/JavassistProxyFactory.java

@@ -11,8 +11,8 @@ import java.lang.reflect.Method;
 import java.util.Locale;
 import java.util.Set;
 
-import javassist.util.proxy.MethodFilter;
+import com.fr.third.javassist.util.proxy.MethodFilter;
-import javassist.util.proxy.Proxy;
+import com.fr.third.javassist.util.proxy.Proxy;
 
 import com.fr.third.org.hibernate.HibernateException;
 import com.fr.third.org.hibernate.engine.spi.SessionImplementor;
@@ -80,17 +80,17 @@ public class JavassistProxyFactory implements ProxyFactory, Serializable {
 		return interfaces.toArray( new Class[interfaces.size()] );
 	}
 
-	private javassist.util.proxy.ProxyFactory buildJavassistProxyFactory() {
+	private com.fr.third.javassist.util.proxy.ProxyFactory buildJavassistProxyFactory() {
 		return buildJavassistProxyFactory(
 				persistentClass,
 				interfaces
 		);
 	}
 
-	public static javassist.util.proxy.ProxyFactory buildJavassistProxyFactory(
+	public static com.fr.third.javassist.util.proxy.ProxyFactory buildJavassistProxyFactory(
 			final Class persistentClass,
 			final Class[] interfaces) {
-		javassist.util.proxy.ProxyFactory factory = new javassist.util.proxy.ProxyFactory() {
+		com.fr.third.javassist.util.proxy.ProxyFactory factory = new com.fr.third.javassist.util.proxy.ProxyFactory() {
 			@Override
 			protected ClassLoader getClassLoader() {
 				return persistentClass.getClassLoader();
@@ -144,7 +144,7 @@ public class JavassistProxyFactory implements ProxyFactory, Serializable {
 				ReflectHelper.overridesEquals( serializableProxy.getPersistentClass() )
 		);
 
-		final javassist.util.proxy.ProxyFactory factory = buildJavassistProxyFactory(
+		final com.fr.third.javassist.util.proxy.ProxyFactory factory = buildJavassistProxyFactory(
 				serializableProxy.getPersistentClass(),
 				serializableProxy.getInterfaces()
 		);

fine-hibernate/src/com/fr/third/org/hibernate/tool/enhance/EnhancementTask.java

@@ -14,8 +14,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javassist.ClassPool;
+import com.fr.third.javassist.ClassPool;
-import javassist.CtClass;
+import com.fr.third.javassist.CtClass;
 
 import com.fr.third.org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
 import com.fr.third.org.hibernate.bytecode.enhance.spi.Enhancer;