Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Hardy Ferentschik 2012-03-14 14:29:35 +01:00 committed by Strong Liu
parent 999632b667
commit c75bd2a0af
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tooling/metamodel-generator/pom.xml
View File

@ -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>

10
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java
View File

@ -82,7 +82,7 @@ public class XmlMetaEntity implements MetaEntity {
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 class XmlMetaEntity implements MetaEntity {
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 @@ public class XmlMetaEntity implements MetaEntity {
}
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();
}