Permalink
Browse files

METAGEN-83 Fixing JAXB incompatabilties - see also HV-528

  • Loading branch information...
1 parent 55ffdff commit 24d8b549b351321a2116f8e4e1c0a733fff9fa86 @hferentschik hferentschik committed Mar 14, 2012
Showing with 19 additions and 3 deletions.
  1. +12 −0 pom.xml
  2. +7 −3 src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java
View
12 pom.xml
@@ -189,6 +189,18 @@
<outputDirectory>${basedir}/target/generated-sources</outputDirectory>
<extension>true</extension>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.13</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<inherited>true</inherited>
@@ -82,7 +82,7 @@
protected AccessTypeInformation accessTypeInfo;
public XmlMetaEntity(Entity ormEntity, String defaultPackageName, TypeElement element, Context context) {
- this( ormEntity.getClazz(), defaultPackageName, element, context, ormEntity.isMetadataComplete() );
+ this( ormEntity.getClazz(), defaultPackageName, element, context, ormEntity.getMetadataComplete() );
this.attributes = ormEntity.getAttributes();
this.embeddableAttributes = null;
// entities can be directly initialised
@@ -91,7 +91,11 @@ public XmlMetaEntity(Entity ormEntity, String defaultPackageName, TypeElement el
protected XmlMetaEntity(MappedSuperclass mappedSuperclass, String defaultPackageName, TypeElement element, Context context) {
this(
- mappedSuperclass.getClazz(), defaultPackageName, element, context, mappedSuperclass.isMetadataComplete()
+ mappedSuperclass.getClazz(),
+ defaultPackageName,
+ element,
+ context,
+ mappedSuperclass.getMetadataComplete()
);
this.attributes = mappedSuperclass.getAttributes();
this.embeddableAttributes = null;
@@ -100,7 +104,7 @@ protected XmlMetaEntity(MappedSuperclass mappedSuperclass, String defaultPackage
}
protected XmlMetaEntity(Embeddable embeddable, String defaultPackageName, TypeElement element, Context context) {
- this( embeddable.getClazz(), defaultPackageName, element, context, embeddable.isMetadataComplete() );
+ this( embeddable.getClazz(), defaultPackageName, element, context, embeddable.getMetadataComplete() );
this.attributes = null;
this.embeddableAttributes = embeddable.getAttributes();
}

0 comments on commit 24d8b54

Please sign in to comment.