[hibernate-commits] Hibernate SVN: r19250 - in validator/trunk/hibernate-validator: src/main/docbook/en-US/modules and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2010-04-20 11:22:58 -0400 (Tue, 20 Apr 2010)
New Revision: 19250

Modified:
   validator/trunk/hibernate-validator/pom.xml
   validator/trunk/hibernate-validator/readme.txt
   validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/gettingstarted.xml
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java
Log:
HV-302 - JAXB shouldn't be required when not using XML configuration


Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml	2010-04-20 15:20:02 UTC (rev 19249)
+++ validator/trunk/hibernate-validator/pom.xml	2010-04-20 15:22:58 UTC (rev 19250)
@@ -47,7 +47,8 @@
 
         <!--
         Provided dependencies.
-        JAXB is needed when running on Java5. In this environment these dependencies have to be added 
+        JAXB is needed when running on Java5. In this environment these dependencies have to be added (unless
+        xml configuration is explicitly disabled via Configuration.ignoreXmlConfiguration)
         On Java6 jaxb is part of the runtime environment                                                                                                           
         -->
         <dependency>

Modified: validator/trunk/hibernate-validator/readme.txt
===================================================================
--- validator/trunk/hibernate-validator/readme.txt	2010-04-20 15:20:02 UTC (rev 19249)
+++ validator/trunk/hibernate-validator/readme.txt	2010-04-20 15:22:58 UTC (rev 19250)
@@ -41,6 +41,8 @@
     jars for log4j (log4j-<version>.jar and slf4j-log4j12-<version>.jar) with the slf4j binding files of
     your choice. See http://www.slf4j.org/manual.html
     In case you are using Java 5 you have to also include all the jar files from the jdk5 subdirectory.
+    The jar files contain the classes needed for using JAXB. If XML configuration is disabled via
+    Configuration.ignoreXmlConfiguration the jar files from the jdk5 subdirectory don't have to be added. 
 
   or 
 

Modified: validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/gettingstarted.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/gettingstarted.xml	2010-04-20 15:20:02 UTC (rev 19249)
+++ validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/gettingstarted.xml	2010-04-20 15:22:58 UTC (rev 19250)
@@ -79,7 +79,12 @@
     &lt;version&gt;2.1.12&lt;/version&gt;
 &lt;/dependency&gt;
 </programlisting> if you are using the SourceForge package you find the
-    necessary libraries in the <filename>lib/jdk5</filename> directory.</para>
+    necessary libraries in the <filename>lib/jdk5</filename> directory. In
+    case you are not using the XML configuration you can also disable it
+    explicitly by calling
+    <methodname>Configuration.ignoreXmlConfiguration()</methodname> during
+    <classname>ValidationFactory</classname> creation. In this case the JAXB
+    dependencies are not needed.</para>
   </note>
 
   <section id="validator-gettingstarted-createproject">

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java	2010-04-20 15:20:02 UTC (rev 19249)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java	2010-04-20 15:22:58 UTC (rev 19250)
@@ -57,13 +57,17 @@
 	private final BeanMetaDataCache beanMetaDataCache;
 
 	public ValidatorFactoryImpl(ConfigurationState configurationState) {
+
 		this.messageInterpolator = configurationState.getMessageInterpolator();
 		this.constraintValidatorFactory = configurationState.getConstraintValidatorFactory();
 		this.traversableResolver = configurationState.getTraversableResolver();
 		this.constraintHelper = new ConstraintHelper();
 		this.beanMetaDataCache = new BeanMetaDataCache();
 
-		initBeanMetaData( configurationState.getMappingStreams() );
+		//HV-302; don't load XmlMappingParser if not necessary
+		if ( !configurationState.getMappingStreams().isEmpty() ) {
+			initBeanMetaData( configurationState.getMappingStreams() );
+		}
 	}
 
 	public Validator getValidator() {