classmate移包

fine-classmate/src/com/fasterxml/classmate/package-info.java

@@ -1,13 +0,0 @@
-/**
- * Package that contains main public interface of ClassMate
- * package.
- *<p>
- * Most commonly resolution starts with {@link com.fasterxml.classmate.TypeResolver},
- * using its <code>resolve()</code> method, which returns a
- * {@link com.fasterxml.classmate.ResolvedType} instance.
- * These type objects contain all necessary information about type itself;
- * but if type information on members (fields, methods, constructors, static
- * members) is needed, {@link com.fasterxml.classmate.MemberResolver} can
- * resolve types for members: it takes {@link com.fasterxml.classmate.ResolvedType}s.
- */
-package com.fasterxml.classmate;

fine-classmate/src/com/fasterxml/classmate/types/package-info.java

@@ -1,5 +0,0 @@
-/**
- * Package that contains {@link com.fasterxml.classmate.ResolvedType}
- * implementation classes.
- */
-package com.fasterxml.classmate.types;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationConfiguration.java

@@ -1,10 +1,10 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.util.*;
 
-import com.fasterxml.classmate.util.ClassKey;
+import com.fr.third.com.fasterxml.classmate.util.ClassKey;
 
 /**
  * Interface for object that determines handling of annotations in regards

fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationInclusion.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 /**
  * Enumeration that defines different settings for handling behavior

fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationOverrides.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.io.Serializable;
 import java.util.*;
 
-import com.fasterxml.classmate.util.ClassKey;
+import com.fr.third.com.fasterxml.classmate.util.ClassKey;
 
 /**
  * Interface for object that can provide mix-ins to override annotations.

fine-classmate/src/com/fr/third/com/fasterxml/classmate/Annotations.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/Filter.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 /**
  * Interface that defines API for basic filtering objects, used to prune set

fine-classmate/src/com/fr/third/com/fasterxml/classmate/GenericType.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.io.Serializable;
 

fine-classmate/src/com/fr/third/com/fasterxml/classmate/MemberResolver.java

@@ -1,10 +1,13 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.io.Serializable;
 import java.util.*;
 
-import com.fasterxml.classmate.members.*;
-import com.fasterxml.classmate.util.ClassKey;
+import com.fr.third.com.fasterxml.classmate.members.RawField;
+import com.fr.third.com.fasterxml.classmate.util.ClassKey;
+import com.fr.third.com.fasterxml.classmate.members.HierarchicType;
+import com.fr.third.com.fasterxml.classmate.members.RawConstructor;
+import com.fr.third.com.fasterxml.classmate.members.RawMethod;
 
 /**
  * Builder class used to completely resolve members (fields, methods,

fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedType.java

@@ -1,13 +1,17 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
+
+import com.fr.third.com.fasterxml.classmate.members.RawConstructor;
+import com.fr.third.com.fasterxml.classmate.members.RawField;
+import com.fr.third.com.fasterxml.classmate.members.RawMethod;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
-import java.util.*;
-
-import com.fasterxml.classmate.members.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public abstract class ResolvedType
     implements Type

fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedTypeWithMembers.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Inherited;
@@ -8,15 +8,21 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.*;
 
-import com.fasterxml.classmate.members.*;
-import com.fasterxml.classmate.util.MethodKey;
+import com.fr.third.com.fasterxml.classmate.members.HierarchicType;
+import com.fr.third.com.fasterxml.classmate.members.RawConstructor;
+import com.fr.third.com.fasterxml.classmate.members.RawField;
+import com.fr.third.com.fasterxml.classmate.members.RawMethod;
+import com.fr.third.com.fasterxml.classmate.members.ResolvedConstructor;
+import com.fr.third.com.fasterxml.classmate.members.ResolvedField;
+import com.fr.third.com.fasterxml.classmate.members.ResolvedMethod;
+import com.fr.third.com.fasterxml.classmate.util.MethodKey;
 
 /**
  * Class that contains information about fully resolved members of a
  * type; resolution meaning that masking is handled for methods, and
  * all inheritable annotations are flattened using optional overrides
  * as well ("mix-in annotations").
- * Instances are created by {@link com.fasterxml.classmate.MemberResolver}.
+ * Instances are created by {@link MemberResolver}.
  *<p>
  * Note that instances are not thread-safe, as the expectation is that instances
  * will not be shared (unlike raw members or resolved types)

fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeBindings.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.lang.reflect.TypeVariable;
 import java.util.*;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeResolver.java

@@ -1,13 +1,18 @@
-package com.fasterxml.classmate;
+package com.fr.third.com.fasterxml.classmate;
 
 import java.io.Serializable;
 import java.lang.reflect.*;
 import java.util.*;
 
-import com.fasterxml.classmate.types.*;
-import com.fasterxml.classmate.util.ClassKey;
-import com.fasterxml.classmate.util.ClassStack;
-import com.fasterxml.classmate.util.ResolvedTypeCache;
+import com.fr.third.com.fasterxml.classmate.util.ClassKey;
+import com.fr.third.com.fasterxml.classmate.util.ClassStack;
+import com.fr.third.com.fasterxml.classmate.util.ResolvedTypeCache;
+import com.fr.third.com.fasterxml.classmate.types.ResolvedArrayType;
+import com.fr.third.com.fasterxml.classmate.types.ResolvedInterfaceType;
+import com.fr.third.com.fasterxml.classmate.types.ResolvedObjectType;
+import com.fr.third.com.fasterxml.classmate.types.ResolvedPrimitiveType;
+import com.fr.third.com.fasterxml.classmate.types.ResolvedRecursiveType;
+import com.fr.third.com.fasterxml.classmate.types.TypePlaceHolder;
 
 /**
  * Object that is used for resolving generic type information of a class

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/HierarchicType.java

@@ -1,7 +1,7 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.ResolvedTypeWithMembers;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.ResolvedTypeWithMembers;
 
 /**
  * Container class used to enclose information about a single {@link ResolvedType}

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawConstructor.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.reflect.Constructor;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.util.MethodKey;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.util.MethodKey;
 
 public final class RawConstructor extends RawMember
 {

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawField.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 public final class RawField extends RawMember
 {

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMember.java

@@ -1,17 +1,17 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Member;
 import java.lang.reflect.Modifier;
 
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 /**
  * Base class for all "raw" member (field, method, constructor) types; raw means that
  * actual types are not yet resolved, but relationship to declaring type is
  * retained for eventual resolution.
- * Instances are typically created by {@link com.fasterxml.classmate.ResolvedType}
+ * Instances are typically created by {@link ResolvedType}
  * when requested, and form the input to eventual full flattening of type members.
  */
 public abstract class RawMember

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMethod.java

@@ -1,10 +1,10 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.util.MethodKey;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.util.MethodKey;
 
 public final class RawMethod extends RawMember
 {

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedConstructor.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.reflect.Constructor;
 
-import com.fasterxml.classmate.Annotations;
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.Annotations;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 /**
  * Class that represents a constructor that has fully resolved generic

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedField.java

@@ -1,10 +1,10 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-import com.fasterxml.classmate.Annotations;
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.Annotations;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 public final class ResolvedField extends ResolvedMember<Field>
      implements Comparable<ResolvedField>

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMember.java

@@ -1,11 +1,11 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Modifier;
 
-import com.fasterxml.classmate.Annotations;
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.Annotations;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 /**
  * Fully type-resolved equivalent of {@link RawMember}. Only members "that matter" (ones not

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMethod.java

@@ -1,10 +1,10 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import com.fasterxml.classmate.Annotations;
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.Annotations;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 public final class ResolvedMethod extends ResolvedParameterizedMember<Method>
      implements Comparable<ResolvedMethod>

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedParameterizedMember.java

@@ -1,7 +1,7 @@
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;
 
-import com.fasterxml.classmate.Annotations;
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.Annotations;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/package-info.java

@@ -2,4 +2,4 @@
  * Package that contains implementations of various member types
  * (methods, fields, constructors)
  */
-package com.fasterxml.classmate.members;
+package com.fr.third.com.fasterxml.classmate.members;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/package-info.java

@@ -0,0 +1,13 @@
+/**
+ * Package that contains main public interface of ClassMate
+ * package.
+ *<p>
+ * Most commonly resolution starts with {@link com.fr.third.com.fasterxml.classmate.TypeResolver},
+ * using its <code>resolve()</code> method, which returns a
+ * {@link com.fr.third.com.fasterxml.classmate.ResolvedType} instance.
+ * These type objects contain all necessary information about type itself;
+ * but if type information on members (fields, methods, constructors, static
+ * members) is needed, {@link com.fr.third.com.fasterxml.classmate.MemberResolver} can
+ * resolve types for members: it takes {@link com.fr.third.com.fasterxml.classmate.ResolvedType}s.
+ */
+package com.fr.third.com.fasterxml.classmate;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedArrayType.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.types;
+package com.fr.third.com.fasterxml.classmate.types;
 
 import java.util.*;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeBindings;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.TypeBindings;
 
 public final class ResolvedArrayType extends ResolvedType
 {

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedInterfaceType.java

@@ -1,11 +1,11 @@
-package com.fasterxml.classmate.types;
+package com.fr.third.com.fasterxml.classmate.types;
 
 import java.util.*;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeBindings;
-import com.fasterxml.classmate.members.RawField;
-import com.fasterxml.classmate.members.RawMethod;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.TypeBindings;
+import com.fr.third.com.fasterxml.classmate.members.RawField;
+import com.fr.third.com.fasterxml.classmate.members.RawMethod;
 
 public class ResolvedInterfaceType extends ResolvedType
 {

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedObjectType.java

@@ -1,15 +1,15 @@
-package com.fasterxml.classmate.types;
+package com.fr.third.com.fasterxml.classmate.types;
 
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeBindings;
-import com.fasterxml.classmate.members.RawConstructor;
-import com.fasterxml.classmate.members.RawField;
-import com.fasterxml.classmate.members.RawMethod;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.TypeBindings;
+import com.fr.third.com.fasterxml.classmate.members.RawConstructor;
+import com.fr.third.com.fasterxml.classmate.members.RawField;
+import com.fr.third.com.fasterxml.classmate.members.RawMethod;
 
 /**
  * Type implementation for classes that do not represent interfaces,

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedPrimitiveType.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.types;
+package com.fr.third.com.fasterxml.classmate.types;
 
 import java.util.*;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeBindings;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.TypeBindings;
 
 /**
  * Type used for Java primitive types (which does not include arrays here).

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedRecursiveType.java

@@ -1,13 +1,13 @@
-package com.fasterxml.classmate.types;
+package com.fr.third.com.fasterxml.classmate.types;
 
 import java.lang.reflect.Modifier;
 import java.util.*;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeBindings;
-import com.fasterxml.classmate.members.RawConstructor;
-import com.fasterxml.classmate.members.RawField;
-import com.fasterxml.classmate.members.RawMethod;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.TypeBindings;
+import com.fr.third.com.fasterxml.classmate.members.RawConstructor;
+import com.fr.third.com.fasterxml.classmate.members.RawField;
+import com.fr.third.com.fasterxml.classmate.members.RawMethod;
 
 /**
  * Specialized type placeholder used in cases where type definition is

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/TypePlaceHolder.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.types;
+package com.fr.third.com.fasterxml.classmate.types;
 
 import java.util.*;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.TypeBindings;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.TypeBindings;
 
 /**
  * Placeholder used for resolving type assignments to figure out

fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Package that contains {@link com.fr.third.com.fasterxml.classmate.ResolvedType}
+ * implementation classes.
+ */
+package com.fr.third.com.fasterxml.classmate.types;

fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassKey.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate.util;
+package com.fr.third.com.fasterxml.classmate.util;
 
 import java.io.Serializable;
 

fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassStack.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.util;
+package com.fr.third.com.fasterxml.classmate.util;
 
 import java.util.ArrayList;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.types.ResolvedRecursiveType;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.types.ResolvedRecursiveType;
 
 /**
  * Simple helper class used to keep track of 'call stack' for classes being referenced

fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/MethodKey.java

@@ -1,4 +1,4 @@
-package com.fasterxml.classmate.util;
+package com.fr.third.com.fasterxml.classmate.util;
 
 import java.io.Serializable;
 

fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ResolvedTypeCache.java

@@ -1,9 +1,9 @@
-package com.fasterxml.classmate.util;
+package com.fr.third.com.fasterxml.classmate.util;
 
 import java.io.Serializable;
 import java.util.*;
 
-import com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
 
 /**
  * Simple LRU cache used for storing up to specified number of most recently accessed

fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Various utility classes used by ClassMate.
  */
-package com.fasterxml.classmate.util;
+package com.fr.third.com.fasterxml.classmate.util;

fine-hibernate/fine-hibernate.iml

@@ -8,9 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="hibernate-build" level="project" />
     <orderEntry type="module" module-name="fine-jboss-logging" />
     <orderEntry type="module" module-name="fine-classmate" />
     <orderEntry type="module" module-name="fine-jpa" />
+    <orderEntry type="library" name="lib-hibernate" level="project" />
   </component>
 </module>

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

@@ -23,11 +23,11 @@ import com.fr.third.org.hibernate.boot.spi.MetadataBuildingContext;
 import com.fr.third.org.hibernate.cfg.AttributeConverterDefinition;
 import com.fr.third.org.hibernate.cfg.annotations.HCANNHelper;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.ResolvedTypeWithMembers;
-import com.fasterxml.classmate.members.ResolvedField;
-import com.fasterxml.classmate.members.ResolvedMember;
-import com.fasterxml.classmate.members.ResolvedMethod;
+import com.fr.third.com.fasterxml.classmate.ResolvedType;
+import com.fr.third.com.fasterxml.classmate.ResolvedTypeWithMembers;
+import com.fr.third.com.fasterxml.classmate.members.ResolvedField;
+import com.fr.third.com.fasterxml.classmate.members.ResolvedMember;
+import com.fr.third.com.fasterxml.classmate.members.ResolvedMethod;
 
 /**
  * The standard AttributeConverterDescriptor implementation

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

@@ -6,8 +6,8 @@
  */
 package com.fr.third.org.hibernate.boot.internal;
 
-import com.fasterxml.classmate.MemberResolver;
-import com.fasterxml.classmate.TypeResolver;
+import com.fr.third.com.fasterxml.classmate.MemberResolver;
+import com.fr.third.com.fasterxml.classmate.TypeResolver;
 
 /**
  * @author Steve Ebersole