[Hibernate-commits] Hibernate Code SVN: r9951 - in trunk/HibernateExt/metadata/src: java/org/hibernate/cfg java/org/hibernate/validator/resources test/org/hibernate/test/annotations/fetch test/org/hibernate/test/annotations/xml/ejb3

[<hib...@li...>]

Author: epbernard
Date: 2006-05-28 11:20:06 -0400 (Sun, 28 May 2006)
New Revision: 9951

Added:
   trunk/HibernateExt/metadata/src/java/org/hibernate/validator/resources/DefaultValidatorMessages_pt_BR.properties
Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/FetchingTest.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/Person.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/xml/ejb3/orm.xml
Log:
ANN-350 support no grammar on EJB3 schema
ANN-351 add brazilian translation
more tests

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2006-05-28 14:47:10 UTC (rev 9950)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2006-05-28 15:20:06 UTC (rev 9951)
@@ -556,6 +556,9 @@
 			SAXReader saxReader = xmlHelper.createSAXReader( "XML InputStream", errors, getEntityResolver() );
 			try {
 				saxReader.setFeature( "http://apache.org/xml/features/validation/schema", true );
+				//saxReader.setFeature( "http://apache.org/xml/features/validation/dynamic", true );
+				saxReader.setProperty( "http://apache.org/xml/properties/schema/external-schemaLocation",
+						"http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd");
 			}
 			catch (SAXException e) {
 				saxReader.setValidation( false );

Added: trunk/HibernateExt/metadata/src/java/org/hibernate/validator/resources/DefaultValidatorMessages_pt_BR.properties
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/validator/resources/DefaultValidatorMessages_pt_BR.properties	2006-05-28 14:47:10 UTC (rev 9950)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/validator/resources/DefaultValidatorMessages_pt_BR.properties	2006-05-28 15:20:06 UTC (rev 9951)
@@ -0,0 +1,12 @@
+validator.assertFalse=asser falhou
+validator.assertTrue=asser falhou
+validator.future=deve ser uma data no futuro
+validator.length=tamanho deve estar entre {min} e {max}
+validator.max=deve ser menor ou igual a {value}
+validator.min=deve ser maior ou igual a {value}
+validator.notNull=npode ser nulo
+validator.past=deve ser uma data no passado
+validator.pattern=deve ser vda de acordo com a express"{regex}"
+validator.range=deve estar entre {min} e {max}
+validator.size=tamanho deve estar entre {min} e {max}
+validator.email=nm email vdo
\ No newline at end of file

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/FetchingTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/FetchingTest.java	2006-05-28 14:47:10 UTC (rev 9950)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/FetchingTest.java	2006-05-28 15:20:06 UTC (rev 9951)
@@ -32,6 +32,30 @@
 		s.close();
 	}
 
+	public void testExtraLazy() throws Exception {
+		Session s;
+		Transaction tx;
+		s = openSession();
+		tx = s.beginTransaction();
+		Person p = new Person( "Gavin", "King", "JBoss Inc" );
+		Stay stay = new Stay( p, new Date(), new Date(), "A380", "Blah", "Blah" );
+		p.getOrderedStay().add( stay );
+		s.persist( p );
+		tx.commit();
+		s.clear();
+		tx = s.beginTransaction();
+		p = (Person) s.createQuery( "from Person p where p.firstName = :name" )
+				.setParameter( "name", "Gavin" ).uniqueResult();
+		assertFalse( Hibernate.isInitialized( p.getOrderedStay() ) );
+		assertEquals( 1, p.getOrderedStay().size() );
+		assertFalse( Hibernate.isInitialized( p.getOrderedStay() ) );
+		assertEquals( "A380", p.getOrderedStay().get(0).getVessel() );
+		assertFalse( Hibernate.isInitialized( p.getOrderedStay() ) );
+		s.delete( p );
+		tx.commit();
+		s.close();
+	}
+
 	public void testHibernateFetchingLazy() throws Exception {
 		Session s;
 		Transaction tx;

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/Person.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/Person.java	2006-05-28 14:47:10 UTC (rev 9950)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/fetch/Person.java	2006-05-28 15:20:06 UTC (rev 9951)
@@ -18,6 +18,7 @@
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.annotations.IndexColumn;
 
 
 /**
@@ -35,6 +36,7 @@
 	private Collection<Stay> stays;
 	private Collection<Stay> oldStays;
 	private Collection<Stay> veryOldStays;
+	private List<Stay> orderedStay = new ArrayList<Stay>();
 
 	// constructors
 	public Person() {
@@ -113,7 +115,19 @@
 		this.veryOldStays = veryOldStays;
 	}
 
+	@OneToMany(cascade=CascadeType.ALL)
+	@LazyCollection(LazyCollectionOption.EXTRA)
+	@Fetch(FetchMode.SUBSELECT)
+	@IndexColumn(name="orderedStayIndex")
+	public List<Stay> getOrderedStay() {
+		return orderedStay;
+	}
 
+	public void setOrderedStay(List<Stay> orderedStay) {
+		this.orderedStay = orderedStay;
+	}
+
+
 	// business logic
 	public void addStay(Date startDate, Date endDate, String vessel, String authoriser, String comments) {
 		Stay stay = new Stay( this, startDate, endDate, vessel, authoriser, comments );

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/xml/ejb3/orm.xml
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/xml/ejb3/orm.xml	2006-05-28 14:47:10 UTC (rev 9950)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/xml/ejb3/orm.xml	2006-05-28 15:20:06 UTC (rev 9951)
@@ -2,9 +2,9 @@
 
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
                  version="1.0"
         >
+    <!-- no grammar specified should pass -->
     <persistence-unit-metadata>
         <persistence-unit-defaults>
             <cascade-persist/>