The following commit has been merged in the master branch:
commit aa8f5c4785a896c0ae4f773c8a7d36b95253cc9e
Author: Charles Plessy <[email protected]>
Date: Wed May 30 13:11:43 2012 +0900
Merged with Brian's 4.0.2.GA-7 version in his PPA.
URL:
https://launchpadlibrarian.net/106396944/libhibernate-validator-java_4.0.2.GA-6ubuntu1_4.0.2.GA-7.diff.gz
diff --git a/debian/changelog b/debian/changelog
index 2643290..5661c91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libhibernate-validator-java (4.0.2.GA-7) UNRELEASED; urgency=low
+
+ * JAXB is now included in OpenJDK, so enabled previously disabled sources
+ * Calling xjc in rules rather than using maven jaxb plugin as it is not
+ packaged
+ * Modified JPATraversableResolver.java to always return null as the
+ method it uses to check its state does not exist in the version of the api
+ provided in Debian. (It was previously disabled completely)
+
+ -- Brian Thomason <[email protected]> Fri, 25 May 2012 17:37:00
+0000
+
libhibernate-validator-java (4.0.2.GA-6ubuntu1) precise; urgency=low
* Fix missing jar file from /usr/share/java.
diff --git a/debian/patches/disable-jpa-persistence-check.patch
b/debian/patches/disable-jpa-persistence-check.patch
new file mode 100644
index 0000000..8dd1d49
--- /dev/null
+++ b/debian/patches/disable-jpa-persistence-check.patch
@@ -0,0 +1,17 @@
+Description: Always return null as method used for persitence check does not
exist in Debian version of API
+Author: Brian Thomason <[email protected]>
+
+---
libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java
++++
libhibernate-validator-java-4.0.2.GA/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java
+@@ -30,8 +30,9 @@ public class JPATraversableResolver impl
+
+ // TODO Check the call to PersistenceUtil.
traversableProperty.getName() is this correct?
+ public boolean isReachable(Object traversableObject, Path.Node
traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject,
ElementType elementType) {
+- return traversableObject == null ||
+- Persistence.getPersistenceUtil().isLoaded(
traversableObject, traversableProperty.getName() );
++ return traversableObject == null;
++//||
++// Persistence.getPersistenceUtil().isLoaded(
traversableObject, traversableProperty.getName() );
+ }
+
+ public boolean isCascadable(Object traversableObject, Path.Node
traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject,
ElementType elementType) {
diff --git a/debian/patches/jaxb-binding-fixes.patch
b/debian/patches/jaxb-binding-fixes.patch
new file mode 100644
index 0000000..1150b2a
--- /dev/null
+++ b/debian/patches/jaxb-binding-fixes.patch
@@ -0,0 +1,106 @@
+Description: JAXB binding fixes
+Author: Brian Thomason <[email protected]>
+
+---
libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
++++
libhibernate-validator-java-4.0.2.GA/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java
+@@ -41,6 +41,9 @@ import org.hibernate.validator.util.Load
+ import org.hibernate.validator.util.LoggerFactory;
+ import org.hibernate.validator.util.NewInstance;
+
++import org.jboss.xml.ns.javax.validation.configuration.ValidationConfigType;
++import org.jboss.xml.ns.javax.validation.configuration.PropertyType;
++
+ /**
+ * Parser for <i>validation.xml</i> using JAXB.
+ *
+@@ -124,15 +127,15 @@ public class ValidationXmlParser {
+ }
+
+ private void setMappingStreamsFromXml(ValidationConfigType config,
ValidationBootstrapParameters xmlParameters) {
+- for ( JAXBElement<String> mappingFileName :
config.getConstraintMapping() ) {
++ for ( String mappingFileName : config.getConstraintMapping() ) {
+ if ( log.isDebugEnabled() ) {
+ log.debug(
+- "Trying to open input stream
for {}.", mappingFileName.getValue()
++ "Trying to open input stream
for {}.", mappingFileName
+ );
+ }
+- InputStream in = getInputStreamForPath(
mappingFileName.getValue() );
++ InputStream in = getInputStreamForPath( mappingFileName
);
+ if ( in == null ) {
+- throw new ValidationException( "Unable to open
input stream for mapping file " + mappingFileName.getValue() + "." );
++ throw new ValidationException( "Unable to open
input stream for mapping file " + mappingFileName + "." );
+ }
+ xmlParameters.mappings.add( in );
+ }
+---
libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
++++
libhibernate-validator-java-4.0.2.GA/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java
+@@ -65,6 +65,22 @@ import org.hibernate.validator.util.Logg
+ import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor;
+ import org.hibernate.validator.util.annotationfactory.AnnotationFactory;
+
++import org.jboss.xml.ns.javax.validation.mapping.ConstraintDefinitionType;
++import org.jboss.xml.ns.javax.validation.mapping.ClassType;
++import org.jboss.xml.ns.javax.validation.mapping.GroupSequenceType;
++import org.jboss.xml.ns.javax.validation.mapping.ConstraintType;
++import org.jboss.xml.ns.javax.validation.mapping.ElementType;
++import org.jboss.xml.ns.javax.validation.mapping.AnnotationType;
++import org.jboss.xml.ns.javax.validation.mapping.GroupsType;
++import org.jboss.xml.ns.javax.validation.mapping.PayloadType;
++import org.jboss.xml.ns.javax.validation.mapping.ConstraintMappingsType;
++import org.jboss.xml.ns.javax.validation.configuration.PropertyType;
++import org.jboss.xml.ns.javax.validation.mapping.FieldType;
++import org.jboss.xml.ns.javax.validation.mapping.ConstraintType;
++import org.jboss.xml.ns.javax.validation.mapping.GetterType;
++import org.jboss.xml.ns.javax.validation.mapping.BeanType;
++import org.jboss.xml.ns.javax.validation.mapping.ValidatedByType;
++
+ /**
+ * @author Hardy Ferentschik
+ */
+@@ -168,10 +184,10 @@ public class XmlMappingParser {
+ if ( validatedByType.isIncludeExistingValidators() !=
null && validatedByType.isIncludeExistingValidators() ) {
+ constraintValidatorClasses.addAll(
findConstraintValidatorClasses( annotationClass ) );
+ }
+- for ( JAXBElement<String> validatorClassName :
validatedByType.getValue() ) {
++ for ( String validatorClassName :
validatedByType.getValue() ) {
+ Class<? extends ConstraintValidator<?, ?>>
validatorClass;
+ validatorClass = ( Class<? extends
ConstraintValidator<?, ?>> ) loadClass(
+- validatorClassName.getValue(),
++ validatorClassName,
+ this.getClass()
+ );
+
+@@ -368,8 +384,8 @@ public class XmlMappingParser {
+ private List<Class<?>> createGroupSequence(GroupSequenceType
groupSequenceType, String defaultPackage) {
+ List<Class<?>> groupSequence = new ArrayList<Class<?>>();
+ if ( groupSequenceType != null ) {
+- for ( JAXBElement<String> groupName :
groupSequenceType.getValue() ) {
+- Class<?> group = getClass(
groupName.getValue(), defaultPackage );
++ for ( String groupName : groupSequenceType.getValue() )
{
++ Class<?> group = getClass( groupName,
defaultPackage );
+ groupSequence.add( group );
+ }
+ }
+@@ -601,8 +617,8 @@ public class XmlMappingParser {
+ }
+
+ List<Class<?>> groupList = new ArrayList<Class<?>>();
+- for ( JAXBElement<String> groupClass : groupsType.getValue() ) {
+- groupList.add( getClass( groupClass.getValue(),
defaultPackage ) );
++ for ( String groupClass : groupsType.getValue() ) {
++ groupList.add( getClass( groupClass, defaultPackage ) );
+ }
+ return groupList.toArray( new Class[groupList.size()] );
+ }
+@@ -614,8 +630,8 @@ public class XmlMappingParser {
+ }
+
+ List<Class<? extends Payload>> payloadList = new
ArrayList<Class<? extends Payload>>();
+- for ( JAXBElement<String> groupClass : payloadType.getValue() )
{
+- Class<?> payload = getClass( groupClass.getValue(),
defaultPackage );
++ for ( String groupClass : payloadType.getValue() ) {
++ Class<?> payload = getClass( groupClass, defaultPackage
);
+ if ( !Payload.class.isAssignableFrom( payload ) ) {
+ throw new ValidationException( "Specified
payload class " + payload.getName() + " does not implement
javax.validation.Payload" );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 2f4981b..be18c7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
-pom_modules.diff
-0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch
+#pom_modules.diff
+#0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch
0002-disable-maven-surefire-report-plugin.patch
+disable-jpa-persistence-check.patch
+jaxb-binding-fixes.patch
diff --git a/debian/rules b/debian/rules
index 7560e33..06806e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,16 @@ JAVA_HOME := /usr/lib/jvm/default-java
clean::
mh_clean
rm -f mvn-build
+ rm -rf $(CURDIR)/hibernate-validator/src/main/java/org/jboss
+ find ./ -name *.class |xargs rm -rf
+
+configure/libhibernate-validator-java::
+ cd $(CURDIR)/hibernate-validator/src/main/java && $(JAVA_HOME)/bin/xjc
-extension -b ../xjb/binding-customization.xjb ../xsd/validation-mapping-1.0.xsd
+ cd $(CURDIR)/hibernate-validator/src/main/java && $(JAVA_HOME)/bin/xjc
../xsd/validation-configuration-1.0.xsd
+
+binary/libhibernate-validator-java::
+ cp pom.xml.save pom.xml
+ cp hibernate-validator/pom.xml.save hibernate-validator/pom.xml
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--
Hibernate Validator
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
