[hibernate-commits] Hibernate SVN: r11126 - in branches/Branch_3_2/HibernateExt: metadata/doc/reference/en/modules and 9 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu Feb 1 11:52:29 EST 2007
Author: epbernard
Date: 2007-02-01 11:52:28 -0500 (Thu, 01 Feb 2007)
New Revision: 11126
Added:
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/
Removed:
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml/
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml/
Modified:
branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.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/cfg/AnnotationConfiguration.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java
branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/XMLContext.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Administration.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Availability.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/BusTrip.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/BusTripPk.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Competition.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/LogListener.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Match.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Organization.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/OtherLogListener.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/TennisMatch.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/XMLContextTest.java
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/metadata-complete.xml
branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/orm.xml
Log:
Move the EJB 3.0 reflection layer to cfg.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/Ejb3Configuration.java 2007-02-01 16:26:11 UTC (rev 11125)
+++ branches/Branch_3_2/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -68,7 +68,7 @@
import org.hibernate.mapping.AuxiliaryDatabaseObject;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.annotations.common.reflection.java.xml.XMLContext;
+import org.hibernate.cfg.annotations.reflection.XMLContext;
import org.hibernate.secure.JACCConfiguration;
import org.hibernate.transaction.JDBCTransactionFactory;
import org.hibernate.util.CollectionHelper;
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-02-01 16:26:11 UTC (rev 11125)
+++ branches/Branch_3_2/HibernateExt/metadata/doc/reference/en/modules/xml-overriding.xml 2007-02-01 16:52:28 UTC (rev 11126)
@@ -95,7 +95,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<entity class="Administration" access="PROPERTY" metadata-complete="true">
<table name="tbl_admin">
<unique-constraint>
@@ -232,7 +232,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<entity class="Music" access="PROPERTY" metadata-complete="true">
<discriminator-value>Generic</discriminator-value>
<discriminator-column length="34"/>
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-02-01 16:26:11 UTC (rev 11125)
+++ branches/Branch_3_2/HibernateExt/metadata/doc/reference/fr/modules/xml-overriding.xml 2007-02-01 16:52:28 UTC (rev 11126)
@@ -99,7 +99,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<entity class="Administration" access="PROPERTY" metadata-complete="true">
<table name="tbl_admin">
<unique-constraint>
@@ -240,7 +240,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<entity class="Music" access="PROPERTY" metadata-complete="true">
<discriminator-value>Generic</discriminator-value>
<discriminator-column length="34"/>
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-02-01 16:26:11 UTC (rev 11125)
+++ branches/Branch_3_2/HibernateExt/metadata/doc/reference/zh_cn/modules/xml-overriding.xml 2007-02-01 16:52:28 UTC (rev 11126)
@@ -82,7 +82,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<entity class="Administration" access="PROPERTY" metadata-complete="true">
<table name="tbl_admin">
<unique-constraint>
@@ -192,7 +192,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<entity class="Music" access="PROPERTY" metadata-complete="true">
<discriminator-value>Generic</discriminator-value>
<discriminator-column length="34"/>
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-02-01 16:26:11 UTC (rev 11125)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -39,7 +39,7 @@
import org.hibernate.mapping.UniqueKey;
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.cfg.annotations.reflection.EJB3ReflectionManager;
import org.hibernate.util.JoinedIterator;
import org.hibernate.util.ReflectHelper;
import org.hibernate.util.StringHelper;
Copied: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection (from rev 11125, branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/annotations/common/reflection/java/xml)
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,4 +1,4 @@
-package org.hibernate.annotations.common.reflection.java.xml;
+package org.hibernate.cfg.annotations.reflection;
import java.beans.Introspector;
import java.lang.annotation.Annotation;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,4 +1,4 @@
-package org.hibernate.annotations.common.reflection.java.xml;
+package org.hibernate.cfg.annotations.reflection;
import java.lang.reflect.AnnotatedElement;
import java.util.ArrayList;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/XMLContext.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.reflection.java.xml;
+package org.hibernate.cfg.annotations.reflection;
import java.util.HashMap;
import java.util.List;
Copied: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection (from rev 11125, branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/annotations/common/test/reflection/java/xml)
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Administration.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Administration.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.Basic;
import javax.persistence.Entity;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Availability.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Availability.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
/**
* @author Emmanuel Bernard
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/BusTrip.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/BusTrip.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import java.util.Date;
import java.util.List;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/BusTripPk.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/BusTripPk.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
/**
* @author Emmanuel Bernard
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Competition.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Competition.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.MappedSuperclass;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
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.annotations.common.reflection.java.xml.EJB3OverridenAnnotationReader;
-import org.hibernate.annotations.common.reflection.java.xml.XMLContext;
+import org.hibernate.cfg.annotations.reflection.EJB3OverridenAnnotationReader;
+import org.hibernate.cfg.annotations.reflection.XMLContext;
import org.hibernate.util.XMLHelper;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -74,13 +74,14 @@
*/
public class EJB3OverridenAnnotationReaderTest extends TestCase {
public void testMappedSuperclassAnnotations() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
+ XMLContext context = buildContext(
+ "org/hibernate/annotations/common/test/reflection/java/reflection/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/annotations/common/test/reflection/java/xml/orm.xml" );
+ XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context );
assertNotNull( reader.getAnnotation( Entity.class ) );
assertEquals(
@@ -210,7 +211,8 @@
}
public void testEntityRelatedAnnotationsMetadataComplete() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
+ XMLContext context = buildContext(
+ "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context );
assertNotNull( reader.getAnnotation( Entity.class ) );
assertEquals(
@@ -247,7 +249,7 @@
}
public void testIdRelatedAnnotations() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
+ XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" );
Method method = Administration.class.getDeclaredMethod( "getId" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context );
assertNull( reader.getAnnotation( Id.class ) );
@@ -266,7 +268,8 @@
assertNotNull( reader.getAnnotation( Temporal.class ) );
assertEquals( TemporalType.DATE, reader.getAnnotation( Temporal.class ).value() );
- context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
+ context = buildContext(
+ "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" );
method = Administration.class.getDeclaredMethod( "getId" );
reader = new EJB3OverridenAnnotationReader( method, context );
assertNotNull(
@@ -291,7 +294,8 @@
}
public void testBasicRelatedAnnotations() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
+ XMLContext context = buildContext(
+ "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" );
Field field = BusTrip.class.getDeclaredField( "status" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context );
assertNotNull( reader.getAnnotation( Enumerated.class ) );
@@ -313,7 +317,7 @@
}
public void testVersionRelatedAnnotations() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
+ XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" );
Method method = Administration.class.getDeclaredMethod( "getVersion" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context );
assertNotNull( reader.getAnnotation( Version.class ) );
@@ -324,7 +328,7 @@
}
public void testTransientAndEmbeddedRelatedAnnotations() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
+ XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" );
Field field = Administration.class.getDeclaredField( "transientField" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context );
@@ -337,7 +341,7 @@
}
public void testAssociationRelatedAnnotations() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
+ XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" );
Field field = Administration.class.getDeclaredField( "defaultBusTrip" );
EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context );
@@ -349,7 +353,8 @@
assertEquals( FetchType.LAZY, reader.getAnnotation( OneToOne.class ).fetch() );
assertEquals( "test", reader.getAnnotation( OneToOne.class ).mappedBy() );
- context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/metadata-complete.xml" );
+ context = buildContext(
+ "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" );
field = BusTrip.class.getDeclaredField( "players" );
reader = new EJB3OverridenAnnotationReader( field, context );
assertNotNull( reader.getAnnotation( OneToMany.class ) );
@@ -372,7 +377,7 @@
}
public void testEntityListeners() throws Exception {
- XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
+ XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/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/test/annotations/reflection/LogListener.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/LogListener.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.PrePersist;
import javax.persistence.PostPersist;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Match.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Match.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Organization.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/Organization.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
/**
* @author Emmanuel Bernard
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/OtherLogListener.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/OtherLogListener.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.PrePersist;
import javax.persistence.PostPersist;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import java.io.Serializable;
import javax.persistence.Embeddable;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.Entity;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/TennisMatch.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/TennisMatch.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/XMLContextTest.java
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/XMLContextTest.java 2007-02-01 16:52:28 UTC (rev 11126)
@@ -1,5 +1,5 @@
//$Id: $
-package org.hibernate.annotations.common.test.reflection.java.xml;
+package org.hibernate.test.annotations.reflection;
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.annotations.common.reflection.java.xml.XMLContext;
+import org.hibernate.cfg.annotations.reflection.XMLContext;
import org.hibernate.util.XMLHelper;
import org.xml.sax.InputSource;
import org.xml.sax.SAXNotSupportedException;
@@ -22,7 +22,8 @@
public void testAll() throws Exception {
XMLHelper xmlHelper = new XMLHelper();
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- InputStream is = cl.getResourceAsStream( "org/hibernate/annotations/common/test/reflection/java/xml/orm.xml" );
+ InputStream is = cl.getResourceAsStream(
+ "org/hibernate/annotations/common/test/reflection/java/reflection/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/test/annotations/reflection/metadata-complete.xml
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/metadata-complete.xml 2007-02-01 16:52:28 UTC (rev 11126)
@@ -13,7 +13,7 @@
<cascade-persist/>
</persistence-unit-defaults>
</persistence-unit-metadata>
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</package>
<mapped-superclass class="Organization">
<attributes>
<basic name="organizationId"/>
Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/orm.xml
===================================================================
--- 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)
+++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/orm.xml 2007-02-01 16:52:28 UTC (rev 11126)
@@ -11,13 +11,13 @@
<catalog>mycatalog</catalog>
<cascade-persist/>
<entity-listeners>
- <entity-listener class="org.hibernate.annotations.common.test.reflection.java.xml.OtherLogListener">
+ <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener">
<post-update method-name="log"/>
</entity-listener>
</entity-listeners>
</persistence-unit-defaults>
</persistence-unit-metadata>
- <package>org.hibernate.annotations.common.test.reflection.java.xml</package>
+ <package>org.hibernate.test.annotations.reflection</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.annotations.common.test.reflection.java.xml.Match">
+ <entity-result entity-class="org.hibernate.test.annotations.reflection.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.annotations.common.test.reflection.java.xml.SocialSecurityNumber"/>
+ <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/>
<discriminator-value>Physical</discriminator-value>
<discriminator-column length="34"/>
</entity>
More information about the hibernate-commits
mailing list