[hibernate-commits] Hibernate SVN: r11125 - in branches/Branch_3_2/HibernateExt: ejb/src/java/org/hibernate/ejb/event and 30 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-02-01 11:26:11 -0500 (Thu, 01 Feb 2007)
New Revision: 11125

Added:
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/
Removed:
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotationfactory/
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/
Modified:
   branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
   branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java
   branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
   branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java
   branches/Branch_3_2/HibernateExt/metadata/doc/reference/en/modules/xml-overriding.xml
   branches/Branch_3_2/HibernateExt/metadata/doc/reference/fr/modules/xml-overriding.xml
   branches/Branch_3_2/HibernateExt/metadata/doc/reference/zh_cn/modules/xml-overriding.xml
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/AnnotationReader.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/Filter.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/ReflectionManager.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XClass.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XMember.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XMethod.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XPackage.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XProperty.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXType.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/Pair.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/EJB3OverridenAnnotationReader.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/EJB3ReflectionManager.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/XMLContext.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AbstractPropertyHolder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ClassPropertyHolder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/CollectionPropertyHolder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/InheritanceState.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyData.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyHolderBuilder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyInferredData.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyPreloadedData.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/WrappedInferredData.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/IdBagBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/PropertyBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/SearchFactory.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
   branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/event/ValidateEventListener.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/AnnotationFactoryTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/AnnotationProxyTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/TestAnnotation.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/Foo.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/FooFather.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaReflectionManagerTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaXClassTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaXPropertyTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/Sex.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/TestAnnotation.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/XAnnotatedElementTestCase.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/ApproximatingTypeEnvironmentTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/BigBlob.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Dad.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Grandpa.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Language.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Neighbour.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Son.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/SonOfBlob.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TestAnnotation.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TypeEnvironmentFactoryTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TypeUtilsTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DeepGenericsContainment.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DeepGenericsInheritance.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Dummy.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DummySubclass.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/GenericSuperclass1.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/GenericSuperclass2.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Subclass1.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Subclass2.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Administration.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Availability.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/BusTrip.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/BusTripPk.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Competition.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/LogListener.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Match.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Organization.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/OtherLogListener.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityMoralAccount.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityNumber.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityPhysicalAccount.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/TennisMatch.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/XMLContextTest.java
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml
   branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/orm.xml
Log:
Move the reflection layer to annotations.common

Modified: branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -68,7 +68,7 @@
 import org.hibernate.mapping.AuxiliaryDatabaseObject;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.reflection.java.xml.XMLContext;
+import org.hibernate.annotations.common.reflection.java.xml.XMLContext;
 import org.hibernate.secure.JACCConfiguration;
 import org.hibernate.transaction.JDBCTransactionFactory;
 import org.hibernate.util.CollectionHelper;

Modified: branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java
===================================================================
--- branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -46,7 +46,7 @@
 import org.hibernate.event.PreUpdateEventListener;
 import org.hibernate.event.SaveOrUpdateEventListener;
 import org.hibernate.mapping.PersistentClass;
-import org.hibernate.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.secure.JACCPreDeleteEventListener;
 import org.hibernate.secure.JACCPreInsertEventListener;
 import org.hibernate.secure.JACCPreLoadEventListener;

Modified: branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
===================================================================
--- branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -19,9 +19,9 @@
 import javax.persistence.MappedSuperclass;
 import javax.persistence.PersistenceException;
 
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMethod;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMethod;
 
 /**
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>

Modified: branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java
===================================================================
--- branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -16,8 +16,8 @@
 import javax.persistence.PreRemove;
 import javax.persistence.PreUpdate;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
 
 /**
  * Keep track of all lifecycle callbacks and listeners for a given persistence unit

Modified: branches/Branch_3_2/HibernateExt/metadata/doc/reference/en/modules/xml-overriding.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/doc/reference/en/modules/xml-overriding.xml	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/doc/reference/en/modules/xml-overriding.xml	2007-02-01 16:26:11 UTC (rev 11125)
@@ -95,7 +95,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
   version="1.0"&gt;
 
-    &lt;package&gt;org.hibernate.test.reflection.java.xml&lt;/package&gt;
+    &lt;package&gt;org.hibernate.annotations.common.test.reflection.java.xml&lt;/package&gt;
     &lt;entity class="Administration" access="PROPERTY" metadata-complete="true"&gt;
         &lt;table name="tbl_admin"&gt;
             &lt;unique-constraint&gt;
@@ -232,7 +232,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
   version="1.0"&gt;
 
-    &lt;package&gt;org.hibernate.test.reflection.java.xml&lt;/package&gt;
+    &lt;package&gt;org.hibernate.annotations.common.test.reflection.java.xml&lt;/package&gt;
     &lt;entity class="Music" access="PROPERTY" metadata-complete="true"&gt;
         &lt;discriminator-value&gt;Generic&lt;/discriminator-value&gt;
         &lt;discriminator-column length="34"/&gt;

Modified: branches/Branch_3_2/HibernateExt/metadata/doc/reference/fr/modules/xml-overriding.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/doc/reference/fr/modules/xml-overriding.xml	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/doc/reference/fr/modules/xml-overriding.xml	2007-02-01 16:26:11 UTC (rev 11125)
@@ -99,7 +99,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
   version="1.0"&gt;
 
-    &lt;package&gt;org.hibernate.test.reflection.java.xml&lt;/package&gt;
+    &lt;package&gt;org.hibernate.annotations.common.test.reflection.java.xml&lt;/package&gt;
     &lt;entity class="Administration" access="PROPERTY" metadata-complete="true"&gt;
         &lt;table name="tbl_admin"&gt;
             &lt;unique-constraint&gt;
@@ -240,7 +240,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
   version="1.0"&gt;
 
-    &lt;package&gt;org.hibernate.test.reflection.java.xml&lt;/package&gt;
+    &lt;package&gt;org.hibernate.annotations.common.test.reflection.java.xml&lt;/package&gt;
     &lt;entity class="Music" access="PROPERTY" metadata-complete="true"&gt;
         &lt;discriminator-value&gt;Generic&lt;/discriminator-value&gt;
         &lt;discriminator-column length="34"/&gt;

Modified: branches/Branch_3_2/HibernateExt/metadata/doc/reference/zh_cn/modules/xml-overriding.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/doc/reference/zh_cn/modules/xml-overriding.xml	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/doc/reference/zh_cn/modules/xml-overriding.xml	2007-02-01 16:26:11 UTC (rev 11125)
@@ -82,7 +82,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
   version="1.0"&gt;
 
-    &lt;package&gt;org.hibernate.test.reflection.java.xml&lt;/package&gt;
+    &lt;package&gt;org.hibernate.annotations.common.test.reflection.java.xml&lt;/package&gt;
     &lt;entity class="Administration" access="PROPERTY" metadata-complete="true"&gt;
         &lt;table name="tbl_admin"&gt;
             &lt;unique-constraint&gt;
@@ -192,7 +192,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
   version="1.0"&gt;
 
-    &lt;package&gt;org.hibernate.test.reflection.java.xml&lt;/package&gt;
+    &lt;package&gt;org.hibernate.annotations.common.test.reflection.java.xml&lt;/package&gt;
     &lt;entity class="Music" access="PROPERTY" metadata-complete="true"&gt;
         &lt;discriminator-value&gt;Generic&lt;/discriminator-value&gt;
         &lt;discriminator-column length="34"/&gt;

Copied: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory (from rev 11116, branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory)

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationDescriptor.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.annotationfactory;
+package org.hibernate.annotations.common.annotationfactory;
 
 import java.lang.annotation.Annotation;
 import java.util.HashMap;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationFactory.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.annotationfactory;
+package org.hibernate.annotations.common.annotationfactory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationProxy.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.annotationfactory;
+package org.hibernate.annotations.common.annotationfactory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;

Copied: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection (from rev 11116, branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection)

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/AnnotationReader.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/AnnotationReader.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/AnnotationReader.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 import java.lang.annotation.Annotation;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/Filter.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/Filter.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/Filter.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 /**
  * Filter properties

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/ReflectionManager.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/ReflectionManager.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/ReflectionManager.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/ReflectionUtil.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,11 +1,11 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import org.hibernate.reflection.java.generics.TypeUtils;
+import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/XAnnotatedElement.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 import java.lang.annotation.Annotation;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XClass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/XClass.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XClass.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 import java.util.List;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XMember.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/XMember.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XMember.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 import java.util.Collection;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XMethod.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/XMethod.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XMethod.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 /**
  * Represent an invokable method

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XPackage.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/XPackage.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XPackage.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XProperty.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/XProperty.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/XProperty.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection;
+package org.hibernate.annotations.common.reflection;
 
 /**
  * A member which actually is a property (as per the JavaBean spec)

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaAnnotationReader.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,9 +1,9 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 
-import org.hibernate.reflection.AnnotationReader;
+import org.hibernate.annotations.common.reflection.AnnotationReader;
 
 /**
  * Reads standard Java annotations.

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaReflectionManager.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Member;
@@ -8,17 +8,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hibernate.reflection.AnnotationReader;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMethod;
-import org.hibernate.reflection.XPackage;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.generics.IdentityTypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeEnvironmentFactory;
-import org.hibernate.reflection.java.generics.TypeSwitch;
-import org.hibernate.reflection.java.generics.TypeUtils;
+import org.hibernate.annotations.common.reflection.AnnotationReader;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMethod;
+import org.hibernate.annotations.common.reflection.XPackage;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.generics.IdentityTypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory;
+import org.hibernate.annotations.common.reflection.java.generics.TypeSwitch;
+import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
 import org.hibernate.util.ReflectHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXAnnotatedElement.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,10 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 
-import org.hibernate.reflection.AnnotationReader;
-import org.hibernate.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.AnnotationReader;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXArrayType.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,13 +1,13 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Type;
 import java.util.Collection;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeSwitch;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeSwitch;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXClass.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -6,13 +6,13 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.hibernate.reflection.Filter;
-import org.hibernate.reflection.ReflectionUtil;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMethod;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.generics.CompoundTypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.Filter;
+import org.hibernate.annotations.common.reflection.ReflectionUtil;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMethod;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.generics.CompoundTypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXCollectionType.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -6,10 +6,10 @@
 import java.util.Map;
 import java.util.SortedMap;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeSwitch;
-import org.hibernate.reflection.java.generics.TypeUtils;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeSwitch;
+import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXMember.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.AnnotatedElement;
@@ -9,9 +9,9 @@
 import java.lang.reflect.Type;
 import java.util.Collection;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMember;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMember;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXMethod.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,12 +1,12 @@
 //$Id$
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
-import org.hibernate.reflection.XMethod;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.XMethod;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXPackage.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,6 +1,6 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
-import org.hibernate.reflection.XPackage;
+import org.hibernate.annotations.common.reflection.XPackage;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXProperty.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.beans.Introspector;
 import java.lang.reflect.Field;
@@ -6,8 +6,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXSimpleType.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,10 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXType.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXType.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/JavaXType.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,12 +1,12 @@
 //$Id: PropertyTypeExtractor.java 9316 2006-02-22 20:47:31Z epbernard $
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeUtils;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
 
 /**
  * The Java X-layer equivalent to a Java <code>Type</code>.

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/Pair.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/Pair.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/Pair.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java;
+package org.hibernate.annotations.common.reflection.java;
 
 /**
  * A pair of objects that can be used as a key in a Map.

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/ApproximatingTypeEnvironment.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/CompoundTypeEnvironment.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.Type;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/IdentityTypeEnvironment.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.Type;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/SimpleTypeEnvironment.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/TypeEnvironment.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.Type;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/TypeEnvironmentFactory.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,8 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Returns the type context for a given <code>Class</code> or <code>ParameterizedType</code>.

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/TypeFactory.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/TypeSwitch.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/TypeUtils.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.generics;
+package org.hibernate.annotations.common.reflection.java.generics;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/EJB3OverridenAnnotationReader.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/EJB3OverridenAnnotationReader.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/EJB3OverridenAnnotationReader.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.xml;
+package org.hibernate.annotations.common.reflection.java.xml;
 
 import java.beans.Introspector;
 import java.lang.annotation.Annotation;
@@ -82,14 +82,14 @@
 import org.dom4j.Attribute;
 import org.dom4j.Element;
 import org.hibernate.AnnotationException;
-import org.hibernate.annotationfactory.AnnotationDescriptor;
-import org.hibernate.annotationfactory.AnnotationFactory;
+import org.hibernate.annotations.common.annotationfactory.AnnotationDescriptor;
+import org.hibernate.annotations.common.annotationfactory.AnnotationFactory;
 import org.hibernate.annotations.AccessType;
 import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.Columns;
-import org.hibernate.reflection.AnnotationReader;
-import org.hibernate.reflection.Filter;
-import org.hibernate.reflection.ReflectionUtil;
+import org.hibernate.annotations.common.reflection.AnnotationReader;
+import org.hibernate.annotations.common.reflection.Filter;
+import org.hibernate.annotations.common.reflection.ReflectionUtil;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/EJB3ReflectionManager.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/EJB3ReflectionManager.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/EJB3ReflectionManager.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.reflection.java.xml;
+package org.hibernate.annotations.common.reflection.java.xml;
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.ArrayList;
@@ -14,8 +14,8 @@
 import javax.persistence.TableGenerator;
 
 import org.dom4j.Element;
-import org.hibernate.reflection.AnnotationReader;
-import org.hibernate.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.reflection.AnnotationReader;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 import org.hibernate.util.ReflectHelper;
 
 public class EJB3ReflectionManager extends JavaReflectionManager {

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/XMLContext.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/XMLContext.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.reflection.java.xml;
+package org.hibernate.annotations.common.reflection.java.xml;
 
 import java.util.HashMap;
 import java.util.List;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AbstractPropertyHolder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AbstractPropertyHolder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AbstractPropertyHolder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -14,9 +14,9 @@
 import javax.persistence.MappedSuperclass;
 
 import org.hibernate.AssertionFailure;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.util.StringHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -121,12 +121,11 @@
 import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
 import org.hibernate.persister.entity.SingleTableEntityPersister;
 import org.hibernate.persister.entity.UnionSubclassEntityPersister;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XPackage;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.xml.EJB3ReflectionManager;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XPackage;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.type.TypeFactory;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -37,9 +37,9 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.UniqueKey;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.java.xml.EJB3ReflectionManager;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.xml.EJB3ReflectionManager;
 import org.hibernate.util.JoinedIterator;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ClassPropertyHolder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ClassPropertyHolder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ClassPropertyHolder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -12,7 +12,7 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Table;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XClass;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/CollectionPropertyHolder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/CollectionPropertyHolder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/CollectionPropertyHolder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -10,8 +10,8 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Table;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -20,8 +20,8 @@
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
 
 /**
  * Allow annotation related mappings

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/InheritanceState.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/InheritanceState.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/InheritanceState.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -6,9 +6,9 @@
 import javax.persistence.InheritanceType;
 import javax.persistence.MappedSuperclass;
 
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.XClass;
 
 /**
  * Some extra data to the inheritance position of a class

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -16,7 +16,7 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.SimpleValue;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.type.ForeignKeyDirection;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyData.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyData.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyData.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,8 +1,8 @@
 package org.hibernate.cfg;
 
 import org.hibernate.MappingException;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 
 public interface PropertyData {
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyHolderBuilder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyHolderBuilder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyHolderBuilder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -8,8 +8,8 @@
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.PersistentClass;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 
 /**
  * This factory is here ot build a PropertyHolder and prevent .mapping interface adding

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyInferredData.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyInferredData.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyInferredData.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -2,12 +2,11 @@
 package org.hibernate.cfg;
 
 import org.hibernate.MappingException;
-import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.AccessType;
 import org.hibernate.annotations.Target;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
 
 /**
  * Retrieve all inferred data from an annnoted element

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyPreloadedData.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyPreloadedData.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyPreloadedData.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -2,8 +2,8 @@
 package org.hibernate.cfg;
 
 import org.hibernate.MappingException;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 
 public class PropertyPreloadedData implements PropertyData {
 	private final String defaultAccess;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/WrappedInferredData.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/WrappedInferredData.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/WrappedInferredData.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,8 +1,8 @@
 //$Id: $
 package org.hibernate.cfg;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.MappingException;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -72,8 +72,8 @@
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.util.StringHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -54,8 +54,8 @@
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.TableOwner;
 import org.hibernate.mapping.Value;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/IdBagBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/IdBagBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/IdBagBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -19,8 +19,8 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.util.StringHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -22,8 +22,8 @@
 import org.hibernate.mapping.OneToMany;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.SimpleValue;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 
 /**
  * Bind a list

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -7,7 +7,6 @@
 import java.util.Random;
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
-import javax.persistence.MapKey;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
@@ -40,9 +39,9 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.sql.Template;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/PropertyBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/PropertyBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/PropertyBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,8 +1,6 @@
 //$Id$
 package org.hibernate.cfg.annotations;
 
-import java.util.Iterator;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
@@ -15,9 +13,8 @@
 import org.hibernate.mapping.PropertyGeneration;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Value;
-import org.hibernate.mapping.Column;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.util.StringHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/SimpleValueBinder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/SimpleValueBinder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -22,8 +22,8 @@
 import org.hibernate.cfg.NotYetImplementedException;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.type.ByteArrayBlobType;
 import org.hibernate.type.CharacterArrayClobType;
 import org.hibernate.type.EnumType;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/SearchFactory.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/SearchFactory.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -17,8 +17,8 @@
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.HibernateException;
 import org.hibernate.mapping.PersistentClass;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -20,8 +20,8 @@
 import org.hibernate.search.bridge.builtin.ShortBridge;
 import org.hibernate.search.annotations.Resolution;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMember;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMember;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -29,11 +29,11 @@
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.util.BinderHelper;
 import org.hibernate.search.SearchFactory;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMember;
-import org.hibernate.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMember;
+import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.util.ReflectHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -12,8 +12,8 @@
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.SearchFactory;
 import org.hibernate.mapping.PersistentClass;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,7 +1,7 @@
 //$Id: $
 package org.hibernate.search.util;
 
-import org.hibernate.reflection.XMember;
+import org.hibernate.annotations.common.reflection.XMember;
 import org.hibernate.util.StringHelper;
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -31,13 +31,13 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Component;
-import org.hibernate.reflection.Filter;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XMember;
-import org.hibernate.reflection.XMethod;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.reflection.Filter;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMember;
+import org.hibernate.annotations.common.reflection.XMethod;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 import org.hibernate.util.IdentitySet;
 import org.hibernate.validator.interpolator.DefaultMessageInterpolatorAggerator;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/event/ValidateEventListener.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/event/ValidateEventListener.java	2007-01-31 23:46:25 UTC (rev 11124)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/validator/event/ValidateEventListener.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -24,8 +24,8 @@
 import org.hibernate.property.Getter;
 import org.hibernate.property.PropertyAccessor;
 import org.hibernate.property.PropertyAccessorFactory;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;
 import org.hibernate.validator.ClassValidator;

Copied: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory (from rev 11116, branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotationfactory)

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/AnnotationFactoryTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotationfactory/AnnotationFactoryTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/AnnotationFactoryTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,8 +1,8 @@
-package org.hibernate.test.annotationfactory;
+package org.hibernate.annotations.common.test.annotationfactory;
 
 import junit.framework.TestCase;
-import org.hibernate.annotationfactory.AnnotationDescriptor;
-import org.hibernate.annotationfactory.AnnotationFactory;
+import org.hibernate.annotations.common.annotationfactory.AnnotationDescriptor;
+import org.hibernate.annotations.common.annotationfactory.AnnotationFactory;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/AnnotationProxyTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotationfactory/AnnotationProxyTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/AnnotationProxyTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,10 @@
-package org.hibernate.test.annotationfactory;
+package org.hibernate.annotations.common.test.annotationfactory;
 
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
-import org.hibernate.annotationfactory.AnnotationDescriptor;
-import org.hibernate.annotationfactory.AnnotationProxy;
+import org.hibernate.annotations.common.annotationfactory.AnnotationDescriptor;
+import org.hibernate.annotations.common.annotationfactory.AnnotationProxy;
 
 /**
  * @author Paolo Perrotta
@@ -58,7 +58,7 @@
 	}
 
 	public void testItsToStringConformsToTheJavaAnnotationDocumentation() throws Throwable {
-		String expectedString = "@org.hibernate.test.annotationfactory.TestAnnotation(booleanElement=false, elementWithDefault=abc, someOtherElement=y, stringElement=x)";
+		String expectedString = "@org.hibernate.annotations.common.test.annotationfactory.TestAnnotation(booleanElement=false, elementWithDefault=abc, someOtherElement=y, stringElement=x)";
 		assertEquals( expectedString, invoke( ann, "toString" ) );
 	}
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/TestAnnotation.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotationfactory/TestAnnotation.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/annotationfactory/TestAnnotation.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.hibernate.test.annotationfactory;
+package org.hibernate.annotations.common.test.annotationfactory;
 
 /**
  * @author Paolo Perrotta

Copied: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection (from rev 11116, branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection)

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/Foo.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/Foo.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/Foo.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import java.util.List;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/FooFather.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/FooFather.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/FooFather.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import java.util.List;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaReflectionManagerTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/JavaReflectionManagerTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaReflectionManagerTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,10 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import com.sun.org.apache.xpath.internal.operations.Number;
 import junit.framework.TestCase;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaXClassTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/JavaXClassTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaXClassTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,17 +1,17 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.JavaReflectionManager;
-import org.hibernate.test.reflection.java.generics.Dad;
-import org.hibernate.test.reflection.java.generics.Grandpa;
-import org.hibernate.test.reflection.java.generics.Language;
-import org.hibernate.test.reflection.java.generics.Son;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.test.reflection.java.generics.Dad;
+import org.hibernate.annotations.common.test.reflection.java.generics.Grandpa;
+import org.hibernate.annotations.common.test.reflection.java.generics.Language;
+import org.hibernate.annotations.common.test.reflection.java.generics.Son;
 
 /**
  * @author Paolo Perrotta
@@ -33,7 +33,7 @@
 	}
 
 	public void testHasAName() {
-		assertSame( "org.hibernate.test.reflection.java.generics.Dad", fatherAsSeenFromSon.getName() );
+		assertSame( "org.hibernate.annotations.common.test.reflection.java.generics.Dad", fatherAsSeenFromSon.getName() );
 	}
 
 	public void testHasASuperclass() {

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaXPropertyTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/JavaXPropertyTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/JavaXPropertyTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,17 +1,17 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import junit.framework.AssertionFailedError;
-import org.hibernate.reflection.Filter;
-import org.hibernate.reflection.ReflectionManager;
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.JavaReflectionManager;
-import org.hibernate.test.reflection.java.generics.Dad;
-import org.hibernate.test.reflection.java.generics.Son;
+import org.hibernate.annotations.common.reflection.Filter;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.test.reflection.java.generics.Dad;
+import org.hibernate.annotations.common.test.reflection.java.generics.Son;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/Sex.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/Sex.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/Sex.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/TestAnnotation.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/TestAnnotation.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/TestAnnotation.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import static java.lang.annotation.ElementType.*;
 import java.lang.annotation.Retention;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/XAnnotatedElementTestCase.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/XAnnotatedElementTestCase.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/XAnnotatedElementTestCase.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,10 @@
-package org.hibernate.test.reflection.java;
+package org.hibernate.annotations.common.test.reflection.java;
 
 import javax.persistence.Transient;
 
 import junit.framework.TestCase;
-import org.hibernate.reflection.XAnnotatedElement;
-import org.hibernate.test.reflection.java.generics.TestAnnotation;
+import org.hibernate.annotations.common.reflection.XAnnotatedElement;
+import org.hibernate.annotations.common.test.reflection.java.generics.TestAnnotation;
 
 /**
  * @author Paolo Perrotta

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/ApproximatingTypeEnvironmentTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/ApproximatingTypeEnvironmentTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/ApproximatingTypeEnvironmentTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -6,8 +6,8 @@
 import java.util.Map;
 
 import junit.framework.TestCase;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeEnvironmentFactory;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory;
 
 public class ApproximatingTypeEnvironmentTest extends TestCase {
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/BigBlob.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/BigBlob.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/BigBlob.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.util.Collection;
 import java.util.List;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Dad.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/Dad.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Dad.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.util.List;
 import java.util.Map;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Grandpa.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/Grandpa.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Grandpa.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.io.Serializable;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Language.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/Language.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Language.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Neighbour.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/Neighbour.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Neighbour.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.util.Set;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Son.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/Son.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/Son.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 /**
  * @author Davide Marchignoli

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/SonOfBlob.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/SonOfBlob.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/SonOfBlob.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.util.List;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TestAnnotation.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/TestAnnotation.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TestAnnotation.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import static java.lang.annotation.ElementType.*;
 import java.lang.annotation.Retention;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TypeEnvironmentFactoryTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/TypeEnvironmentFactoryTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TypeEnvironmentFactoryTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -7,7 +7,7 @@
 import java.util.Set;
 
 import junit.framework.TestCase;
-import org.hibernate.reflection.java.generics.TypeEnvironmentFactory;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory;
 
 /**
  * @author Davide Marchignoli

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TypeUtilsTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/TypeUtilsTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/TypeUtilsTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,11 +1,11 @@
-package org.hibernate.test.reflection.java.generics;
+package org.hibernate.annotations.common.test.reflection.java.generics;
 
 import java.lang.reflect.Type;
 
 import junit.framework.TestCase;
-import org.hibernate.reflection.java.generics.TypeEnvironment;
-import org.hibernate.reflection.java.generics.TypeEnvironmentFactory;
-import org.hibernate.reflection.java.generics.TypeUtils;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironment;
+import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory;
+import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
 
 public class TypeUtilsTest extends TestCase {
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DeepGenericsContainment.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DeepGenericsContainment.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DeepGenericsContainment.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,13 +1,13 @@
 //$Id: $
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.hibernate.reflection.XClass;
-import org.hibernate.reflection.XProperty;
-import org.hibernate.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DeepGenericsInheritance.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DeepGenericsInheritance.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DeepGenericsInheritance.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,9 +1,9 @@
 //$Id: $
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import junit.framework.TestCase;
-import org.hibernate.reflection.java.JavaReflectionManager;
-import org.hibernate.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
 
 
 /**

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Dummy.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Dummy.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Dummy.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,4 +1,4 @@
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Id;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DummySubclass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DummySubclass.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/DummySubclass.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,8 +1,8 @@
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import javax.persistence.Entity;
 
-import org.hibernate.test.reflection.java.generics.deep.Dummy;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.Dummy;
 
 /**
  *

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/GenericSuperclass1.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/GenericSuperclass1.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/GenericSuperclass1.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,10 +1,10 @@
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import javax.persistence.MappedSuperclass;
 import javax.persistence.OneToOne;
 import javax.persistence.Id;
 
-import org.hibernate.test.reflection.java.generics.deep.Dummy;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.Dummy;
 
 /**
  *

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/GenericSuperclass2.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/GenericSuperclass2.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/GenericSuperclass2.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,9 +1,9 @@
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import javax.persistence.MappedSuperclass;
 
-import org.hibernate.test.reflection.java.generics.deep.Dummy;
-import org.hibernate.test.reflection.java.generics.deep.GenericSuperclass1;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.Dummy;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.GenericSuperclass1;
 
 /**
  *

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Subclass1.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Subclass1.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Subclass1.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,9 +1,9 @@
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import javax.persistence.Entity;
 
-import org.hibernate.test.reflection.java.generics.deep.DummySubclass;
-import org.hibernate.test.reflection.java.generics.deep.GenericSuperclass1;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.DummySubclass;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.GenericSuperclass1;
 
 /**
  *

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Subclass2.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Subclass2.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/generics/deep/Subclass2.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,9 +1,9 @@
-package org.hibernate.test.reflection.java.generics.deep;
+package org.hibernate.annotations.common.test.reflection.java.generics.deep;
 
 import javax.persistence.Entity;
 
-import org.hibernate.test.reflection.java.generics.deep.DummySubclass;
-import org.hibernate.test.reflection.java.generics.deep.GenericSuperclass2;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.DummySubclass;
+import org.hibernate.annotations.common.test.reflection.java.generics.deep.GenericSuperclass2;
 
 /**
  *

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Administration.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Administration.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Administration.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.Basic;
 import javax.persistence.Entity;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Availability.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Availability.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Availability.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/BusTrip.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/BusTrip.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/BusTrip.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import java.util.Date;
 import java.util.List;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/BusTripPk.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/BusTripPk.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/BusTripPk.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Competition.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Competition.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Competition.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.MappedSuperclass;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -61,8 +61,8 @@
 import org.dom4j.io.SAXReader;
 import org.hibernate.annotations.Columns;
 import org.hibernate.cfg.EJB3DTDEntityResolver;
-import org.hibernate.reflection.java.xml.EJB3OverridenAnnotationReader;
-import org.hibernate.reflection.java.xml.XMLContext;
+import org.hibernate.annotations.common.reflection.java.xml.EJB3OverridenAnnotationReader;
+import org.hibernate.annotations.common.reflection.java.xml.XMLContext;
 import org.hibernate.util.XMLHelper;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -74,13 +74,13 @@
  */
 public class EJB3OverridenAnnotationReaderTest extends TestCase {
 	public void testMappedSuperclassAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/metadata-complete.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Organization.class, context );
 		assertTrue( reader.isAnnotationPresent( MappedSuperclass.class ) );
 	}
 
 	public void testEntityRelatedAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context );
 		assertNotNull( reader.getAnnotation( Entity.class ) );
 		assertEquals(
@@ -210,7 +210,7 @@
 	}
 
 	public void testEntityRelatedAnnotationsMetadataComplete() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/metadata-complete.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context );
 		assertNotNull( reader.getAnnotation( Entity.class ) );
 		assertEquals(
@@ -247,7 +247,7 @@
 	}
 
 	public void testIdRelatedAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 		Method method = Administration.class.getDeclaredMethod( "getId" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context );
 		assertNull( reader.getAnnotation( Id.class ) );
@@ -266,7 +266,7 @@
 		assertNotNull( reader.getAnnotation( Temporal.class ) );
 		assertEquals( TemporalType.DATE, reader.getAnnotation( Temporal.class ).value() );
 
-		context = buildContext( "org/hibernate/test/reflection/java/xml/metadata-complete.xml" );
+		context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
 		method = Administration.class.getDeclaredMethod( "getId" );
 		reader = new EJB3OverridenAnnotationReader( method, context );
 		assertNotNull(
@@ -291,7 +291,7 @@
 	}
 
 	public void testBasicRelatedAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/metadata-complete.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
 		Field field = BusTrip.class.getDeclaredField( "status" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context );
 		assertNotNull( reader.getAnnotation( Enumerated.class ) );
@@ -313,7 +313,7 @@
 	}
 
 	public void testVersionRelatedAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 		Method method = Administration.class.getDeclaredMethod( "getVersion" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context );
 		assertNotNull( reader.getAnnotation( Version.class ) );
@@ -324,7 +324,7 @@
 	}
 
 	public void testTransientAndEmbeddedRelatedAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 
 		Field field = Administration.class.getDeclaredField( "transientField" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context );
@@ -337,7 +337,7 @@
 	}
 
 	public void testAssociationRelatedAnnotations() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 
 		Field field = Administration.class.getDeclaredField( "defaultBusTrip" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context );
@@ -349,7 +349,7 @@
 		assertEquals( FetchType.LAZY, reader.getAnnotation( OneToOne.class ).fetch() );
 		assertEquals( "test", reader.getAnnotation( OneToOne.class ).mappedBy() );
 
-		context = buildContext( "org/hibernate/test/reflection/java/xml/metadata-complete.xml" );
+		context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
 		field = BusTrip.class.getDeclaredField( "players" );
 		reader = new EJB3OverridenAnnotationReader( field, context );
 		assertNotNull( reader.getAnnotation( OneToMany.class ) );
@@ -372,7 +372,7 @@
 	}
 
 	public void testEntityListeners() throws Exception {
-		XMLContext context = buildContext( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 
 		Method method = Administration.class.getDeclaredMethod( "calculate" );
 		EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context );

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/LogListener.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/LogListener.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/LogListener.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.PrePersist;
 import javax.persistence.PostPersist;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Match.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Match.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Match.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Organization.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Organization.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/Organization.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 /**
  * @author Emmanuel Bernard

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/OtherLogListener.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/OtherLogListener.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/OtherLogListener.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.PrePersist;
 import javax.persistence.PostPersist;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityMoralAccount.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/SocialSecurityMoralAccount.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityMoralAccount.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityNumber.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/SocialSecurityNumber.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityNumber.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import java.io.Serializable;
 import javax.persistence.Embeddable;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityPhysicalAccount.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/SocialSecurityPhysicalAccount.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/SocialSecurityPhysicalAccount.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.Entity;
 

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/TennisMatch.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/TennisMatch.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/TennisMatch.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/XMLContextTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/XMLContextTest.java	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/XMLContextTest.java	2007-02-01 16:26:11 UTC (rev 11125)
@@ -1,5 +1,5 @@
 //$Id: $
-package org.hibernate.test.reflection.java.xml;
+package org.hibernate.annotations.common.test.reflection.java.xml;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import junit.framework.TestCase;
 import org.dom4j.io.SAXReader;
 import org.hibernate.cfg.EJB3DTDEntityResolver;
-import org.hibernate.reflection.java.xml.XMLContext;
+import org.hibernate.annotations.common.reflection.java.xml.XMLContext;
 import org.hibernate.util.XMLHelper;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXNotSupportedException;
@@ -22,7 +22,7 @@
 	public void testAll() throws Exception {
 		XMLHelper xmlHelper = new XMLHelper();
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
-		InputStream is = cl.getResourceAsStream( "org/hibernate/test/reflection/java/xml/orm.xml" );
+		InputStream is = cl.getResourceAsStream( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
 		assertNotNull( "ORM.xml not found", is );
 		XMLContext context = new XMLContext();
 		List errors = new ArrayList();

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/metadata-complete.xml	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml	2007-02-01 16:26:11 UTC (rev 11125)
@@ -13,7 +13,7 @@
             <cascade-persist/>
         </persistence-unit-defaults>
     </persistence-unit-metadata>
-    <package>org.hibernate.test.reflection.java.xml</package>
+    <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
     <mapped-superclass class="Organization">
         <attributes>
             <basic name="organizationId"/>

Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/orm.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/orm.xml	2007-01-30 14:30:55 UTC (rev 11116)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/orm.xml	2007-02-01 16:26:11 UTC (rev 11125)
@@ -11,13 +11,13 @@
             <catalog>mycatalog</catalog>
             <cascade-persist/>
             <entity-listeners>
-                <entity-listener class="org.hibernate.test.reflection.java.xml.OtherLogListener">
+                <entity-listener class="org.hibernate.annotations.common.test.reflection.java.xml.OtherLogListener">
                     <post-update method-name="log"/>
                 </entity-listener>
             </entity-listeners>
         </persistence-unit-defaults>
     </persistence-unit-metadata>
-    <package>org.hibernate.test.reflection.java.xml</package>
+    <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
     <entity class="Administration">
         <table name="tbl_admin">
             <unique-constraint>
@@ -80,7 +80,7 @@
             <hint name="org.hibernate.timeout" value="200"/>
         </named-native-query>
         <sql-result-set-mapping name="matchrs">
-            <entity-result entity-class="org.hibernate.test.reflection.java.xml.Match">
+            <entity-result entity-class="org.hibernate.annotations.common.test.reflection.java.xml.Match">
                 <field-result name="competitor1Point" column="competitor1Point"/>
             </entity-result>
             <column-result name="competitor1Point"/>
@@ -110,7 +110,7 @@
         </association-override>
     </entity>
     <entity class="SocialSecurityPhysicalAccount">
-        <id-class class="org.hibernate.test.reflection.java.xml.SocialSecurityNumber"/>
+        <id-class class="org.hibernate.annotations.common.test.reflection.java.xml.SocialSecurityNumber"/>
         <discriminator-value>Physical</discriminator-value>
         <discriminator-column length="34"/>
     </entity>