[Hibernate-commits] Hibernate Code SVN: r9665 - trunk/HibernateExt/metadata/src/java/org/hibernate/cfg

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

Author: bi...@jb...
Date: 2006-03-20 14:27:29 -0500 (Mon, 20 Mar 2006)
New Revision: 9665

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
Log:
optional schema validation.  If no schema, don't validate

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2006-03-20 15:10:41 UTC (rev 9664)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2006-03-20 19:27:29 UTC (rev 9665)
@@ -198,7 +198,7 @@
 		annotatedClassEntities = new HashMap<String, XClass>();
 		hbmDocuments = new ArrayList<Document>();
 		namingStrategy = EJB3NamingStrategy.INSTANCE;
-		setEntityResolver( EJB3DTDEntityResolver.INSTANCE );
+		setEntityResolver( new EJB3DTDEntityResolver() );
 	}
 
 	@Override

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java	2006-03-20 15:10:41 UTC (rev 9664)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java	2006-03-20 19:27:29 UTC (rev 9665)
@@ -17,7 +17,14 @@
 
 	private static final Log log = LogFactory.getLog( EJB3DTDEntityResolver.class );
 
-	public InputSource resolveEntity(String publicId, String systemId) {
+   boolean resolved = false;
+
+   public boolean isResolved()
+   {
+      return resolved;
+   }
+
+   public InputSource resolveEntity(String publicId, String systemId) {
 		InputSource is = super.resolveEntity( publicId, systemId );
 		if (is == null) {
 			if ( systemId != null ) {
@@ -33,7 +40,8 @@
 						InputSource source = new InputSource( dtdStream );
 						source.setPublicId( publicId );
 						source.setSystemId( systemId );
-						return source;
+                  resolved = false;
+                  return source;
 					}
 				}
 				else if ( systemId.endsWith( "persistence_1_0.xsd" ) ) {
@@ -48,13 +56,15 @@
 						InputSource source = new InputSource( dtdStream );
 						source.setPublicId( publicId );
 						source.setSystemId( systemId );
-						return source;
+                  resolved = true;
+                  return source;
 					}
 				}
 			}
 		}
 		else {
-			return is;
+         resolved = true;
+         return is;
 		}
 		//use the default behavior
 		return null;