Skip to content

Commit

Permalink
Revert "Update to Jakarta XML and use latest JAXB (3.0.0-M4)."
Browse files Browse the repository at this point in the history 
This reverts commit d4d2598.
  • Loading branch information
@mattrpav
mattrpav committed Apr 25, 2022
1 parent d26ca84 commit 67a6b68
Show file tree
Hide file tree
Showing 112 changed files with 210 additions and 211 deletions.
2 changes: 0 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
target
.project
.settings
*.iml
.idea
2 changes: 1 addition & 1 deletion ...src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.Map;
import java.util.Map.Entry;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.apache.commons.lang3.Validate;
import org.jvnet.jaxb2_commons.codemodel.JCMType;
Expand Down
2 changes: 1 addition & 1 deletion basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.HashSet;
import java.util.Set;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.apache.commons.lang3.Validate;

Expand Down
2 changes: 1 addition & 1 deletion basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.HashSet;
import java.util.Set;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.jvnet.jaxb2_commons.codemodel.JConditionable;

Expand Down
4 changes: 2 additions & 2 deletions basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.jvnet.jaxb2_commons.plugin.inheritance;

import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;

import org.jvnet.jaxb2_commons.util.CustomizationUtils;
Expand Down
12 changes: 6 additions & 6 deletions basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jvnet.jaxb2_commons.plugin.inheritance;

import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlValue;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "extends")
@XmlAccessorType(XmlAccessType.PROPERTY)
Expand Down
12 changes: 6 additions & 6 deletions basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jvnet.jaxb2_commons.plugin.inheritance;

import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlValue;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "implements")
@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
Expand Down
2 changes: 1 addition & 1 deletion basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.plugin.inheritance;

import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;

@XmlRegistry
public class ObjectFactory {
Expand Down
12 changes: 6 additions & 6 deletions .../src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import java.util.ArrayList;
import java.util.List;

import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;

@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "objectFactory")
@XmlType(propOrder = { "extendsClass", "implementsInterface" })
Expand Down
2 changes: 1 addition & 1 deletion basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.sun.tools.xjc.model.CTypeRef;
import com.sun.tools.xjc.model.CValuePropertyInfo;
import com.sun.tools.xjc.model.Model;
import org.glassfish.jaxb.core.v2.model.core.ID;
import com.sun.xml.bind.v2.model.core.ID;

public class SimplifyPlugin extends AbstractParameterizablePlugin {

Expand Down
2 changes: 1 addition & 1 deletion basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.sun.tools.xjc.model.CPropertyInfo;
import com.sun.tools.xjc.model.CReferencePropertyInfo;
import com.sun.tools.xjc.model.Model;
import org.glassfish.jaxb.core.v2.model.core.WildcardMode;
import com.sun.xml.bind.v2.model.core.WildcardMode;

public class WildcardPlugin extends AbstractParameterizablePlugin {

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jaxb.version>3.0.0-M4</jaxb.version>
<jaxb.version>2.3.0</jaxb.version>
<activation.version>1.2.0</activation.version>
<maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
<cxf-codegen-plugin.version>3.2.4</cxf-codegen-plugin.version>
Expand Down Expand Up @@ -210,9 +210,9 @@
</dependency>
<!-- JAXB -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.0-RC3</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down
4 changes: 2 additions & 2 deletions runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</parent>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import java.io.StringWriter;

import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;

public class ContextUtils {

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.ArrayList;
import java.util.List;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.jvnet.jaxb2_commons.locator.ObjectLocator;
import org.w3c.dom.Node;
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.Iterator;
import java.util.List;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.jvnet.jaxb2_commons.locator.ObjectLocator;

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import java.util.List;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.jvnet.jaxb2_commons.locator.ObjectLocator;

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.lang;

import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBElement;

import org.jvnet.jaxb2_commons.locator.ObjectLocator;

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.locator;

import jakarta.xml.bind.ValidationEventLocator;
import javax.xml.bind.ValidationEventLocator;

import org.jvnet.jaxb2_commons.i18n.Reportable;

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.xml.bind;

import jakarta.xml.bind.Marshaller;
import javax.xml.bind.Marshaller;

public interface AfterMarshallCallback {

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.xml.bind;

import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.Unmarshaller;

public interface AfterUnmarshallCallback {

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.xml.bind;

import jakarta.xml.bind.Marshaller;
import javax.xml.bind.Marshaller;

public interface BeforeMarshallCallback {

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jvnet.jaxb2_commons.xml.bind;

import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.Unmarshaller;

public interface BeforeUnmarshallCallback {

Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.LinkedList;
import java.util.List;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlAdapter;

import org.jvnet.jaxb2_commons.lang.StringUtils;

Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.PropertyInfoOrigin;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.ClassInfo;
import org.glassfish.jaxb.core.v2.model.core.PropertyInfo;
import com.sun.xml.bind.v2.model.core.ClassInfo;
import com.sun.xml.bind.v2.model.core.PropertyInfo;

public class CMClassInfo<T, C extends T> implements MClassInfo<T, C> {

Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.EnumLeafInfoOrigin;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumLeafInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.EnumConstant;
import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo;
import com.sun.xml.bind.v2.model.core.EnumConstant;
import com.sun.xml.bind.v2.model.core.EnumLeafInfo;

public class CMEnumLeafInfo<T, C extends T> implements MEnumLeafInfo<T, C>,
MCustomizable {
Expand Down
38 changes: 19 additions & 19 deletions runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.Map;
import java.util.Set;

import jakarta.activation.MimeType;
import javax.activation.MimeType;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;

Expand Down Expand Up @@ -46,24 +46,24 @@
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.Adapter;
import org.glassfish.jaxb.core.v2.model.core.AttributePropertyInfo;
import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo;
import org.glassfish.jaxb.core.v2.model.core.ClassInfo;
import org.glassfish.jaxb.core.v2.model.core.Element;
import org.glassfish.jaxb.core.v2.model.core.ElementInfo;
import org.glassfish.jaxb.core.v2.model.core.ElementPropertyInfo;
import org.glassfish.jaxb.core.v2.model.core.EnumConstant;
import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo;
import org.glassfish.jaxb.core.v2.model.core.ID;
import org.glassfish.jaxb.core.v2.model.core.MapPropertyInfo;
import org.glassfish.jaxb.core.v2.model.core.PropertyInfo;
import org.glassfish.jaxb.core.v2.model.core.ReferencePropertyInfo;
import org.glassfish.jaxb.core.v2.model.core.TypeInfo;
import org.glassfish.jaxb.core.v2.model.core.TypeInfoSet;
import org.glassfish.jaxb.core.v2.model.core.TypeRef;
import org.glassfish.jaxb.core.v2.model.core.ValuePropertyInfo;
import org.glassfish.jaxb.core.v2.model.core.WildcardTypeInfo;
import com.sun.xml.bind.v2.model.core.Adapter;
import com.sun.xml.bind.v2.model.core.AttributePropertyInfo;
import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo;
import com.sun.xml.bind.v2.model.core.ClassInfo;
import com.sun.xml.bind.v2.model.core.Element;
import com.sun.xml.bind.v2.model.core.ElementInfo;
import com.sun.xml.bind.v2.model.core.ElementPropertyInfo;
import com.sun.xml.bind.v2.model.core.EnumConstant;
import com.sun.xml.bind.v2.model.core.EnumLeafInfo;
import com.sun.xml.bind.v2.model.core.ID;
import com.sun.xml.bind.v2.model.core.MapPropertyInfo;
import com.sun.xml.bind.v2.model.core.PropertyInfo;
import com.sun.xml.bind.v2.model.core.ReferencePropertyInfo;
import com.sun.xml.bind.v2.model.core.TypeInfo;
import com.sun.xml.bind.v2.model.core.TypeInfoSet;
import com.sun.xml.bind.v2.model.core.TypeRef;
import com.sun.xml.bind.v2.model.core.ValuePropertyInfo;
import com.sun.xml.bind.v2.model.core.WildcardTypeInfo;

@SuppressWarnings("unchecked")
public abstract class CMInfoFactory<T, C extends T, TIS extends TypeInfoSet<T, C, ?, ?>,
Expand Down
8 changes: 4 additions & 4 deletions runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.TypeInfoSetOrigin;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.ClassInfo;
import org.glassfish.jaxb.core.v2.model.core.ElementInfo;
import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo;
import org.glassfish.jaxb.core.v2.model.core.TypeInfoSet;
import com.sun.xml.bind.v2.model.core.ClassInfo;
import com.sun.xml.bind.v2.model.core.ElementInfo;
import com.sun.xml.bind.v2.model.core.EnumLeafInfo;
import com.sun.xml.bind.v2.model.core.TypeInfoSet;

public class CMModel<T, C extends T> implements MModelInfo<T, C> {

Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.jvnet.jaxb2_commons.xml.bind.model.MSourced;

import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo;
import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo;

public interface BuiltinLeafInfoOrigin<T, C, BLI extends BuiltinLeafInfo<T, C>> extends MSourced<BLI>{

Expand Down
2 changes: 1 addition & 1 deletion .../java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.jvnet.jaxb2_commons.lang.Validate;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo;
import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo;

public class CMBuiltinLeafInfoOrigin<T, C, BLI extends BuiltinLeafInfo<T, C>>
implements MBuiltinLeafInfoOrigin, BuiltinLeafInfoOrigin<T, C, BLI> {
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.jvnet.jaxb2_commons.lang.Validate;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.ClassInfo;
import com.sun.xml.bind.v2.model.core.ClassInfo;

public class CMClassElementInfoOrigin<T, C, CI extends ClassInfo<T, C>>
implements MElementInfoOrigin, ClassInfoOrigin<T, C, CI> {
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.ClassInfo;
import com.sun.xml.bind.v2.model.core.ClassInfo;

public class CMClassInfoOrigin<T, C, CI extends ClassInfo<T, C>> implements
MClassInfoOrigin, ClassInfoOrigin<T, C, CI> {
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.jvnet.jaxb2_commons.lang.Validate;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin;

import org.glassfish.jaxb.core.v2.model.core.ElementInfo;
import com.sun.xml.bind.v2.model.core.ElementInfo;

public class CMElementInfoOrigin<T, C, EI extends ElementInfo<T, C>> implements
MElementInfoOrigin, ElementInfoOrigin<T, C, EI> {
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.jvnet.jaxb2_commons.lang.Validate;
import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin;

import org.glassfish.jaxb.core.v2.model.core.Element;
import com.sun.xml.bind.v2.model.core.Element;

public class CMElementOrigin<T, C, E extends Element<T, C>>
implements MElementOrigin, ElementOrigin<T, C, E> {
Expand Down
Loading

0 comments on commit 67a6b68

Please sign in to comment.