[hibernate-commits] Hibernate SVN: r16595 - in validator/trunk/hibernate-validator: src/main/java/org/hibernate/validation/engine/xml and 2 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue May 19 06:29:18 EDT 2009
Author: hardy.ferentschik
Date: 2009-05-19 06:29:18 -0400 (Tue, 19 May 2009)
New Revision: 16595
Modified:
validator/trunk/hibernate-validator/pom.xml
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java
validator/trunk/hibernate-validator/src/main/xjb/binding-customization.xjb
validator/trunk/hibernate-validator/src/test/resources/META-INF/validation.xml
Log:
HV-162 Added CollapsedStringAdapter to binding-customization
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2009-05-19 09:55:46 UTC (rev 16594)
+++ validator/trunk/hibernate-validator/pom.xml 2009-05-19 10:29:18 UTC (rev 16595)
@@ -103,6 +103,7 @@
<configuration>
<packageName>org.hibernate.validation.xml</packageName>
<outputDirectory>${basedir}/target/generated-sources</outputDirectory>
+ <extension>true</extension>
</configuration>
</plugin>
<plugin>
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java 2009-05-19 09:55:46 UTC (rev 16594)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/ValidationXmlParser.java 2009-05-19 10:29:18 UTC (rev 16595)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -115,12 +115,12 @@
}
private void setMappingStreamsFromXml(ValidationConfigType config, ValidationBootstrapParameters xmlParameters) {
- for ( String mappingFileName : config.getConstraintMapping() ) {
+ for ( JAXBElement<String> mappingFileName : config.getConstraintMapping() ) {
if ( log.isDebugEnabled() ) {
log.debug(
"Trying to open input stream for {}.", mappingFileName
);
- InputStream in = getInputStreamForPath( mappingFileName );
+ InputStream in = getInputStreamForPath( mappingFileName.getValue() );
if ( in == null ) {
throw new ValidationException( "Unable to open input stream for mapping file " + mappingFileName + "." );
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java 2009-05-19 09:55:46 UTC (rev 16594)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/xml/XmlMappingParser.java 2009-05-19 10:29:18 UTC (rev 16595)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -162,11 +162,11 @@
if ( validatedByType.isIncludeExistingValidators() != null && validatedByType.isIncludeExistingValidators() ) {
constraintValidatorClasses.addAll( findConstraintValidatorClasses( annotationClass ) );
}
- for ( String validatorClassName : validatedByType.getValue() ) {
+ for ( JAXBElement<String> validatorClassName : validatedByType.getValue() ) {
Class<? extends ConstraintValidator<?, ?>> validatorClass;
try {
validatorClass = ( Class<? extends ConstraintValidator<?, ?>> ) ReflectionHelper.classForName(
- validatorClassName,
+ validatorClassName.getValue(),
this.getClass()
);
}
@@ -318,8 +318,8 @@
private List<Class<?>> createGroupSequence(GroupSequenceType groupSequenceType, String defaultPackage) {
List<Class<?>> groupSequence = new ArrayList<Class<?>>();
- for ( String groupName : groupSequenceType.getValue() ) {
- Class<?> group = getClass( groupName, defaultPackage );
+ for ( JAXBElement<String> groupName : groupSequenceType.getValue() ) {
+ Class<?> group = getClass( groupName.getValue(), defaultPackage );
groupSequence.add( group );
}
return groupSequence;
@@ -537,8 +537,8 @@
}
List<Class<?>> groupList = new ArrayList<Class<?>>();
- for ( String groupClass : groupsType.getValue() ) {
- groupList.add( getClass( groupClass, defaultPackage ) );
+ for ( JAXBElement<String> groupClass : groupsType.getValue() ) {
+ groupList.add( getClass( groupClass.getValue(), defaultPackage ) );
}
return groupList.toArray( new Class[groupList.size()] );
}
Modified: validator/trunk/hibernate-validator/src/main/xjb/binding-customization.xjb
===================================================================
--- validator/trunk/hibernate-validator/src/main/xjb/binding-customization.xjb 2009-05-19 09:55:46 UTC (rev 16594)
+++ validator/trunk/hibernate-validator/src/main/xjb/binding-customization.xjb 2009-05-19 10:29:18 UTC (rev 16595)
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jxb:bindings version="1.0"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
+<jxb:bindings version="1.0" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
<jxb:bindings schemaLocation="../xsd/validation-mapping-1.0.xsd" node="/xs:schema">
+ <jxb:globalBindings>
+ <xjc:javaType name="java.lang.String" xmlType="xs:string"
+ adapter="javax.xml.bind.annotation.adapters.CollapsedStringAdapter"/>
+ </jxb:globalBindings>
+
<jxb:bindings node="//xs:complexType[8]/xs:sequence[1]/xs:element[1]">
<jxb:property name="classType"/>
</jxb:bindings>
</jxb:bindings>
</jxb:bindings>
-
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/test/resources/META-INF/validation.xml
===================================================================
--- validator/trunk/hibernate-validator/src/test/resources/META-INF/validation.xml 2009-05-19 09:55:46 UTC (rev 16594)
+++ validator/trunk/hibernate-validator/src/test/resources/META-INF/validation.xml 2009-05-19 10:29:18 UTC (rev 16595)
@@ -2,9 +2,12 @@
<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <default-provider>org.hibernate.validation.engine.HibernateValidatorConfiguration</default-provider>
- <message-interpolator>org.hibernate.validation.engine.ResourceBundleMessageInterpolator</message-interpolator>
+ <default-provider>org.hibernate.validation.engine.HibernateValidatorConfiguration
+ </default-provider>
+ <message-interpolator>
+ org.hibernate.validation.engine.ResourceBundleMessageInterpolator
+ </message-interpolator>
<constraint-mapping>/META-INF/validation/order-constraints.xml</constraint-mapping>
- <constraint-mapping>META-INF/validation/user-constraints.xml</constraint-mapping>
+ <constraint-mapping> META-INF/validation/user-constraints.xml </constraint-mapping>
<property name="org.hibernate.validator.test">foobar</property>
</validation-config>
\ No newline at end of file
More information about the hibernate-commits
mailing list