Author: epbernard Date: 2007-02-01 12:39:23 -0500 (Thu, 01 Feb 2007) New Revision: 11127 Added: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Parameter.java Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.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/XMLContextTest.java Log: Fix some test issues ANN-550 Modified: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java =================================================================== --- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java 2007-02-01 16:52:28 UTC (rev 11126) +++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java 2007-02-01 17:39:23 UTC (rev 11127) @@ -7,8 +7,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.hibernate.annotations.Parameter; - /** * specifies a given field bridge implementation * Added: branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Parameter.java =================================================================== --- branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Parameter.java (rev 0) +++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Parameter.java 2007-02-01 17:39:23 UTC (rev 11127) @@ -0,0 +1,19 @@ +//$Id: $ +package org.hibernate.search.annotations; + +import java.lang.annotation.Target; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Parameter (basically key/value pattern) + * + * @author Emmanuel Bernard + */ +@Target({}) +@Retention(RUNTIME) +public @interface Parameter { + String name(); + + String value(); +} \ No newline at end of file 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-02-01 16:52:28 UTC (rev 11126) +++ branches/Branch_3_2/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java 2007-02-01 17:39:23 UTC (rev 11127) @@ -19,7 +19,7 @@ import org.hibernate.search.bridge.builtin.DoubleBridge; import org.hibernate.search.bridge.builtin.ShortBridge; import org.hibernate.search.annotations.Resolution; -import org.hibernate.annotations.Parameter; +import org.hibernate.search.annotations.Parameter; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XMember; Modified: branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.java =================================================================== --- branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.java 2007-02-01 16:52:28 UTC (rev 11126) +++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.java 2007-02-01 17:39:23 UTC (rev 11127) @@ -12,7 +12,7 @@ import org.hibernate.search.annotations.DateBridge; import org.hibernate.search.annotations.FieldBridge; import org.hibernate.search.annotations.Resolution; -import org.hibernate.annotations.Parameter; +import org.hibernate.search.annotations.Parameter; /** * @author Emmanuel Bernard 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/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2007-02-01 16:52:28 UTC (rev 11126) +++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2007-02-01 17:39:23 UTC (rev 11127) @@ -75,13 +75,13 @@ public class EJB3OverridenAnnotationReaderTest extends TestCase { public void testMappedSuperclassAnnotations() throws Exception { XMLContext context = buildContext( - "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/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/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context ); assertNotNull( reader.getAnnotation( Entity.class ) ); assertEquals( @@ -212,7 +212,7 @@ public void testEntityRelatedAnnotationsMetadataComplete() throws Exception { XMLContext context = buildContext( - "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( Administration.class, context ); assertNotNull( reader.getAnnotation( Entity.class ) ); assertEquals( @@ -249,7 +249,7 @@ } public void testIdRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); Method method = Administration.class.getDeclaredMethod( "getId" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context ); assertNull( reader.getAnnotation( Id.class ) ); @@ -269,7 +269,7 @@ assertEquals( TemporalType.DATE, reader.getAnnotation( Temporal.class ).value() ); context = buildContext( - "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); method = Administration.class.getDeclaredMethod( "getId" ); reader = new EJB3OverridenAnnotationReader( method, context ); assertNotNull( @@ -295,7 +295,7 @@ public void testBasicRelatedAnnotations() throws Exception { XMLContext context = buildContext( - "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); Field field = BusTrip.class.getDeclaredField( "status" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context ); assertNotNull( reader.getAnnotation( Enumerated.class ) ); @@ -317,7 +317,7 @@ } public void testVersionRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); Method method = Administration.class.getDeclaredMethod( "getVersion" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context ); assertNotNull( reader.getAnnotation( Version.class ) ); @@ -328,7 +328,7 @@ } public void testTransientAndEmbeddedRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); Field field = Administration.class.getDeclaredField( "transientField" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context ); @@ -341,7 +341,7 @@ } public void testAssociationRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); Field field = Administration.class.getDeclaredField( "defaultBusTrip" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( field, context ); @@ -354,7 +354,7 @@ assertEquals( "test", reader.getAnnotation( OneToOne.class ).mappedBy() ); context = buildContext( - "org/hibernate/annotations/common/test/reflection/java/reflection/metadata-complete.xml" ); + "org/hibernate/test/annotations/reflection/metadata-complete.xml" ); field = BusTrip.class.getDeclaredField( "players" ); reader = new EJB3OverridenAnnotationReader( field, context ); assertNotNull( reader.getAnnotation( OneToMany.class ) ); @@ -377,7 +377,7 @@ } public void testEntityListeners() throws Exception { - XMLContext context = buildContext( "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); Method method = Administration.class.getDeclaredMethod( "calculate" ); EJB3OverridenAnnotationReader reader = new EJB3OverridenAnnotationReader( method, context ); @@ -424,6 +424,9 @@ finally { is.close(); } + if (errors.size() > 0) { + System.out.println( errors.get( 0 ) ); + } assertEquals( 0, errors.size() ); context.addDocument( doc ); return context; 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/test/annotations/reflection/XMLContextTest.java 2007-02-01 16:52:28 UTC (rev 11126) +++ branches/Branch_3_2/HibernateExt/metadata/src/test/org/hibernate/test/annotations/reflection/XMLContextTest.java 2007-02-01 17:39:23 UTC (rev 11127) @@ -23,7 +23,7 @@ XMLHelper xmlHelper = new XMLHelper(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); InputStream is = cl.getResourceAsStream( - "org/hibernate/annotations/common/test/reflection/java/reflection/orm.xml" ); + "org/hibernate/test/annotations/reflection/orm.xml" ); assertNotNull( "ORM.xml not found", is ); XMLContext context = new XMLContext(); List errors = new ArrayList();