diff --git a/.gitignore b/.gitignore index 4a6acd1e..59ff1631 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /err /std target +bin .project .settings .classpath diff --git a/README.md b/README.md index 9b6132c9..5a51382b 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -# JAXB2 Basics +# JAXB3 Basics -JAXB2 Basics is an [open source](https://github.com/highsource/jaxb2-basics/blob/master/LICENSE) project -which provides useful plugins and tools for [JAXB 2.x reference implementation](https://jaxb.java.net/). +JAXB3 Basics is an [open source](https://github.com/highsource/jaxb2-basics/blob/master/LICENSE) project +which provides useful plugins and tools for [JAXB 3.x reference implementation](https://jakarta.ee/specifications/xml-binding/3.0/). # Documentation Please refer to the [wiki](https://github.com/highsource/jaxb2-basics/wiki) for documentation. -JAXB2 Basics can only be used with JAXB/XJC 2.3.0 and higher. JAXB/XJC versions 2.2.x and earlier are no longer supported. +JAXB3 Basics can only be used with JAXB/XJC 3.0 and higher. JAXB/XJC versions 2.x and earlier are no longer supported. -JAXB2 Basics can only be used with Java 1.8 and above. +JAXB3 Basics can only be used with Java 1.8 and above. -## Using JAXB2 Basics +## Using JAXB3 Basics -* [Using JAXB2 Basics Plugins](https://github.com/highsource/jaxb2-basics/wiki/Using-JAXB2-Basics-Plugins) +* [Using JAXB3 Basics Plugins](https://github.com/highsource/jaxb2-basics/wiki/Using-JAXB2-Basics-Plugins) -## JAXB2 Basics Plugins +## JAXB3 Basics Plugins * [SimpleEquals Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleEquals-Plugin) - generates runtime-free reflection-free `equals(...)` methods. * [SimpleHashCode Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleHashCode-Plugin) - generates runtime-free reflection-free `hashCode()` methods. * Equals Plugin - generates reflection-free strategic `equals(...)` method. @@ -30,6 +30,8 @@ JAXB2 Basics can only be used with Java 1.8 and above. * [Simplify Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-Simplify-Plugin) - simplifies weird properties like `aOrBOrC`. * [EnumValue Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-EnumValue-Plugin) - makes all the generated enums implement the `EnumValue` interface. * JAXBIndex Plugin - generated `jaxb.index` files listing schema-derived classes. +* Fluent-Api Plugin - generates a fluent api in addition to the default (JavaBean) setter methods +* Value-Constructor Plugin - generates two constructors for each generated class, one of which is a default constructor, the other takes an argument for each field in the class and initialises the field with the argument value * [FixJAXB1058 Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-FixJAXB1058-Plugin) - fixes [JAXB-1058](https://java.net/jira/browse/JAXB-1058). ## Credits ## diff --git a/ant/pom.xml b/ant/pom.xml index 3c14d1c3..fd187cb4 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - jaxb2-basics-ant + jaxb3-basics-ant jar - JAXB2 Basics - Ant Task + JAXB3 Basics - Ant Task - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT @@ -16,7 +16,7 @@ com.sun.activation - javax.activation + jakarta.activation provided diff --git a/ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJC2Task.java b/ant/src/main/java/org/jvnet/jaxb3_commons/xjc/XJC2Task.java similarity index 96% rename from ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJC2Task.java rename to ant/src/main/java/org/jvnet/jaxb3_commons/xjc/XJC2Task.java index 13dda546..9db669ed 100644 --- a/ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJC2Task.java +++ b/ant/src/main/java/org/jvnet/jaxb3_commons/xjc/XJC2Task.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc; +package org.jvnet.jaxb3_commons.xjc; import org.apache.tools.ant.BuildException; diff --git a/basic/pom.xml b/basic/pom.xml index 22935dfd..2755e379 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -1,21 +1,21 @@ 4.0.0 - jaxb2-basics + jaxb3-basics jar - JAXB2 Basics - Basic Plugins + JAXB3 Basics - Basic Plugins - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime - org.jvnet.jaxb2_commons - jaxb2-basics-tools + org.jvnet.jaxb3_commons + jaxb3-basics-tools org.glassfish.jaxb @@ -32,8 +32,8 @@ javaparser - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test @@ -78,7 +78,7 @@ - org.jvnet.jaxb2.maven2 + org.jvnet.jaxb maven-jaxb2-plugin diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java deleted file mode 100644 index 54ca235a..00000000 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; - -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) -public class ExtendsClass { - - private String className; - - @XmlValue - @XmlJavaTypeAdapter(value = CollapsedStringAdapter.class) - String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - -} diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java deleted file mode 100644 index 854a4d5f..00000000 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; - -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) -public class ImplementsInterface { - - private String interfaceName; - - @XmlValue - @XmlJavaTypeAdapter(value = CollapsedStringAdapter.class) - public String getInterfaceName() { - return interfaceName; - } - - public void setInterfaceName(String interfaceName) { - this.interfaceName = interfaceName; - } - -} diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Customizations.java similarity index 77% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Customizations.java index 1557a9a5..a5eed5ca 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb3_commons.plugin; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic"; public static QName GENERATED_ELEMENT_NAME = new QName(NAMESPACE_URI, "generated"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/CustomizedIgnoring.java similarity index 95% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/CustomizedIgnoring.java index 3a0ee95a..4b601c3d 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/CustomizedIgnoring.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb3_commons.plugin; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.util.CustomizationUtils; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CEnumLeafInfo; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Ignoring.java similarity index 94% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Ignoring.java index d5ae14f6..b3471b97 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Ignoring.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb3_commons.plugin; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CEnumLeafInfo; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/autoinheritance/AutoInheritancePlugin.java similarity index 96% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/autoinheritance/AutoInheritancePlugin.java index 2754259e..68bfae2d 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/autoinheritance/AutoInheritancePlugin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.plugin.autoinheritance; +package org.jvnet.jaxb3_commons.plugin.autoinheritance; import java.util.LinkedList; import java.util.List; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JClass; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java similarity index 88% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java index 70db7d1a..186c0980 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import org.apache.commons.lang3.Validate; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerator.java similarity index 93% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerator.java index 235bbced..a9b607d3 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import org.apache.commons.lang3.Validate; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java similarity index 84% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java index 7ea22953..728c0b57 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/Arguments.java similarity index 93% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/Arguments.java index 850615a0..f58d575a 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/Arguments.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ArrayCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ArrayCodeGenerator.java index b289cd45..1906bdba 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ArrayCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/BooleanCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/BooleanCodeGenerator.java index decfa2f6..27692839 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/BooleanCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ByteCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ByteCodeGenerator.java index 289c2ab9..b0ce29af 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ByteCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CharCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CharCodeGenerator.java index 31ae1bd0..522e2ed9 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CharCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationAbstraction.java similarity index 95% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationAbstraction.java index 285a0db8..5ad7959b 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationAbstraction.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; import java.util.LinkedHashMap; @@ -6,11 +6,11 @@ import java.util.Map; import java.util.Map.Entry; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.codemodel.JCMType; -import org.jvnet.jaxb2_commons.codemodel.JCMTypeFactory; +import org.jvnet.jaxb3_commons.codemodel.JCMType; +import org.jvnet.jaxb3_commons.codemodel.JCMTypeFactory; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationImplementor.java similarity index 94% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationImplementor.java index 55dfa19f..a3a8490a 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationImplementor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerator.java similarity index 83% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerator.java index c37fd939..a08f1993 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/DoubleCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/DoubleCodeGenerator.java index 101e865f..e7b44670 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/DoubleCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/FloatCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/FloatCodeGenerator.java index 15b66245..63575410 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/FloatCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/IntCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/IntCodeGenerator.java index 0b7110de..3c8e624d 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/IntCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/JAXBElementCodeGenerator.java similarity index 97% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/JAXBElementCodeGenerator.java index 5613c600..603d4cd4 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/JAXBElementCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; import java.util.Collections; @@ -9,7 +9,7 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.codemodel.JCMTypeFactory; +import org.jvnet.jaxb3_commons.codemodel.JCMTypeFactory; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ListCodeGenerator.java similarity index 96% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ListCodeGenerator.java index 35260acb..a0aeb070 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ListCodeGenerator.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.apache.commons.lang3.Validate; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/LongCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/LongCodeGenerator.java index d3c726fa..0ede5ce8 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/LongCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ObjectCodeGenerator.java similarity index 95% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ObjectCodeGenerator.java index 14d600cf..30a6cccc 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ObjectCodeGenerator.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.codemodel.JConditionable; +import org.jvnet.jaxb3_commons.codemodel.JConditionable; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ShortCodeGenerator.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ShortCodeGenerator.java index 97a2727b..4fa01ab6 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ShortCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb3_commons.plugin.codegenerator; import java.util.Collection; diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/commons_lang/XjcCommonsLangPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/commons_lang/XjcCommonsLangPlugin.java new file mode 100644 index 00000000..1fe3b4b9 --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/commons_lang/XjcCommonsLangPlugin.java @@ -0,0 +1,197 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jvnet.jaxb3_commons.plugin.commons_lang; + +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.xml.sax.ErrorHandler; + +import com.sun.codemodel.JCodeModel; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JExpr; +import com.sun.codemodel.JExpression; +import com.sun.codemodel.JMethod; +import com.sun.codemodel.JMod; +import com.sun.codemodel.JVar; +import com.sun.tools.xjc.BadCommandLineException; +import com.sun.tools.xjc.Options; +import com.sun.tools.xjc.Plugin; +import com.sun.tools.xjc.outline.ClassOutline; +import com.sun.tools.xjc.outline.Outline; + +/** + * Automatically generates the toString(), hashCode() and equals() methods + * using Jakarta's commons-lang. + *

+ * Supports the optional ToStringStyle command line parameter to specify + * the style for use within the toString method. + *

+ * 

+ * Example 1:
+ *  
+ *     -Xcommons-lang
+ *     -Xcommons-lang:ToStringStyle=SIMPLE_STYLE
+ *     
+ *     to specify the use of 
+ * 
+ *     org.apache.commons.lang3.builder.ToStringStyle.SIMPLE_STYLE
+ *     
+ * Example 2:
+ *  
+ *     -Xcommons-lang
+ *     -Xcommons-lang:ToStringStyle=my.CustomToStringStyle
+ *     
+ *     to specify the use of 
+ * 
+ *     my.CustomToStringStyle, which must be a subclass of 
+ *     
+ *     org.apache.commons.lang3.builder.ToStringStyle, and contains a public no-arg constructor.
+ *     
+ *
+ *

+ * The default ToStringStyle adopted by this plugin is MULTI_LINE_STYLE. + * + * @see org.apache.commons.lang.builder.ToStringStyle + * @author Hanson Char + */ +public class XjcCommonsLangPlugin extends Plugin +{ + private static final String TOSTRING_STYLE_PARAM = "-Xcommons-lang:ToStringStyle="; + private String toStringStyle = "MULTI_LINE_STYLE"; + private Class customToStringStyle; + + @Override + public String getOptionName() + { + return "Xcommons-lang"; + } + + @Override + public String getUsage() + { + return " -Xcommons-lang : generate toString(), hashCode() and equals() for generated code using Jakarta's common-lang\n" + + " [-Xcommons-lang:ToStringStyle=MULTI_LINE_STYLE\n\t" + + "| DEFAULT_STYLE\n\t" + + "| NO_FIELD_NAMES_STYLE\n\t" + + "| SHORT_PREFIX_STYLE\n\t" + + "| SIMPLE_STYLE\n\t" + + "| ]\n" + ; + } + + @Override + public boolean run(Outline outline, + @SuppressWarnings("unused") Options opt, + @SuppressWarnings("unused") ErrorHandler errorHandler) + { + // Process every pojo class generated by jaxb + for (ClassOutline classOutline : outline.getClasses()) { + JDefinedClass implClass = classOutline.implClass; + this.createToStringMethod(implClass); + this.createEqualsMethod(implClass); + this.createHashCodeMethod(implClass); + } + return true; + } + + private void createToStringMethod(JDefinedClass implClass) + { + JCodeModel codeModel = implClass.owner(); + JMethod toStringMethod = + implClass.method(JMod.PUBLIC, codeModel.ref(String.class), "toString"); + // Annotate with @Override + toStringMethod.annotate(Override.class); + final JExpression toStringStyleExpr = + customToStringStyle == null + ? codeModel.ref(ToStringStyle.class) + .staticRef(toStringStyle) + : JExpr._new( + codeModel.ref(customToStringStyle)) + ; + // Invoke ToStringBuilder.reflectionToString(Object,StringStyle) + toStringMethod.body() + ._return( + codeModel.ref(ToStringBuilder.class) + .staticInvoke("reflectionToString") + .arg(JExpr._this()) + .arg(toStringStyleExpr) + ); + return; + } + + private void createEqualsMethod(JDefinedClass implClass) + { + JCodeModel codeModel = implClass.owner(); + JMethod toStringMethod = + implClass.method(JMod.PUBLIC, codeModel.BOOLEAN, "equals"); + JVar that = toStringMethod.param(Object.class, "that"); + // Annotate with @Override + toStringMethod.annotate(Override.class); + // Invoke EqualsBuilder.reflectionEquals(Object,Object); + toStringMethod.body()._return( + codeModel.ref(EqualsBuilder.class) + .staticInvoke("reflectionEquals") + .arg(JExpr._this()) + .arg(that) + ); + return; + } + + private void createHashCodeMethod(JDefinedClass implClass) + { + JCodeModel codeModel = implClass.owner(); + JMethod toStringMethod = + implClass.method(JMod.PUBLIC, codeModel.INT, "hashCode"); + // Annotate with @Override + toStringMethod.annotate(Override.class); + // Invoke EqualsBuilder.reflectionHashCode(Object); + toStringMethod.body()._return( + codeModel.ref(HashCodeBuilder.class) + .staticInvoke("reflectionHashCode") + .arg(JExpr._this()) + ); + return; + } + + @Override + public int parseArgument(Options opt, String[] args, int i) + throws BadCommandLineException + { + // eg. -Xcommons-lang ToStringStyle=SIMPLE_STYLE + String arg = args[i].trim(); + + if (arg.startsWith(TOSTRING_STYLE_PARAM)) + { + toStringStyle = arg.substring(TOSTRING_STYLE_PARAM.length()); + try { + ToStringStyle.class.getField(toStringStyle); + return 1; + } catch (SecurityException e) { + throw new BadCommandLineException(e.getMessage()); + } catch (NoSuchFieldException ignore) { + } + try { + customToStringStyle = Class.forName(toStringStyle); + } catch (ClassNotFoundException e) { + throw new BadCommandLineException(e.getMessage()); + } + return 1; + } + return 0; + } +} diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/copyable/CopyablePlugin.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/copyable/CopyablePlugin.java index 8b6f236c..f1119f9a 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/copyable/CopyablePlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.copyable; +package org.jvnet.jaxb3_commons.plugin.copyable; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.CopyStrategy2; -import org.jvnet.jaxb2_commons.lang.CopyTo2; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.ClassUtils; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.lang.CopyStrategy2; +import org.jvnet.jaxb3_commons.lang.CopyTo2; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.util.LocatorUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JBlock; @@ -78,7 +78,7 @@ public JExpression createCopyStrategy(JCodeModel codeModel) { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.copyable.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.copyable.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -93,7 +93,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.copyable.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.copyable.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/copyable/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/copyable/Customizations.java index 9ee7f781..cd37d325 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/copyable/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.copyable; +package org.jvnet.jaxb3_commons.plugin.copyable; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/copyable"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/copyable"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/customizations/Customizations.java similarity index 69% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/customizations/Customizations.java index b35488df..1f655ce1 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/customizations/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.customizations; +package org.jvnet.jaxb3_commons.plugin.customizations; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/customizations"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/customizations"; public static String CUSTOMIZATIONS_LOCAL_PART = "customizations"; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/customizations/CustomizationsPlugin.java similarity index 97% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/customizations/CustomizationsPlugin.java index f844e2e7..f1adfc98 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/customizations/CustomizationsPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.customizations; +package org.jvnet.jaxb3_commons.plugin.customizations; import java.io.File; import java.io.FileInputStream; @@ -13,8 +13,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java new file mode 100644 index 00000000..f69781fc --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java @@ -0,0 +1,324 @@ +package org.jvnet.jaxb3_commons.plugin.defaultvalueplugin; + +import java.util.Map; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.xml.sax.ErrorHandler; + +import com.sun.codemodel.ClassType; +import com.sun.codemodel.JBlock; +import com.sun.codemodel.JCatchBlock; +import com.sun.codemodel.JClass; +import com.sun.codemodel.JCodeModel; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JEnumConstant; +import com.sun.codemodel.JExpr; +import com.sun.codemodel.JFieldVar; +import com.sun.codemodel.JMod; +import com.sun.codemodel.JTryBlock; +import com.sun.codemodel.JType; +import com.sun.codemodel.JVar; +import com.sun.tools.xjc.Options; +import com.sun.tools.xjc.Plugin; +import com.sun.tools.xjc.model.CPropertyInfo; +import com.sun.tools.xjc.outline.ClassOutline; +import com.sun.tools.xjc.outline.EnumConstantOutline; +import com.sun.tools.xjc.outline.EnumOutline; +import com.sun.tools.xjc.outline.FieldOutline; +import com.sun.tools.xjc.outline.Outline; +import com.sun.xml.xsom.XSElementDecl; +import com.sun.xml.xsom.XSParticle; +import com.sun.xml.xsom.XSTerm; + +/** + * Modifies the JAXB code model to set default values to the schema "default" attribute. + * Currently, the following field types can be initialized: + *

    + *
  • Enumerations (see {@link Enum})
    • + *
  • {@link String}
    • + *
  • Descendants of {@link java.lang.Number} + *
      + *
    • {@link Byte}
      • + *
    • {@link Double}
      • + *
    • {@link Float}
      • + *
    • {@link Integer}
      • + *
    • {@link Long}
      • + *
    • {@link Short}
      • + *
    + *
    • + *
  • {@link Boolean}
    • + *
+ * + * Created: Mon Apr 24 22:04:25 2006 + * + * @author Hari Selvarajan + * @author J�rgen Lukasczyk + * @version 1.1 + */ +public class DefaultValuePlugin + extends Plugin +{ + + /** + * Name of Option to enable this plugin + */ + static private final String OPTION_NAME = "Xdefault-value"; + + + /** + * Creates a new DefaultValuePlugin instance. + * + */ + public DefaultValuePlugin() { + } + + + /** + * DefaultValuePlugin uses "-Xdefault-value" as the command-line + * argument + * + */ + public String getOptionName() { + return OPTION_NAME; + } + + + /** + * Return usage information for plugin + * + */ + public String getUsage() + { + return " -"+OPTION_NAME+" : enable rewriting of classes to set default values for fields as specified in XML schema"; + } + + /** + * Run the plugin. We perform the following steps: + * + *
    + *
  • Look for fields that: + *
      + *
    • Were generated from XSD description
      • + *
    • The XSD description is of type xsd:element (code level default values + * are not necessary for fields generated from attributes)
      • + *
    • A default value is specified
      • + *
    • Map to one of the supported types
      • + *
    + *
    • + *
  • Add a new initializsation expression to every field found
    • + *
+ * + */ + public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) + { + // For all Classes generated + for (ClassOutline co : outline.getClasses()) { + + // Some conversions may have to add class level code + JFieldVar dtf = null; // Helper code: DatatypeFactory + + // check all Fields in Class + for (FieldOutline f : co.getDeclaredFields()) { + CPropertyInfo fieldInfo = f.getPropertyInfo(); + + // Do nothing if Field is not created from an xsd particle + if (!(fieldInfo.getSchemaComponent() instanceof XSParticle)) { + continue; + } + XSTerm term = ((XSParticle) fieldInfo.getSchemaComponent()).getTerm(); + + // Default values only necessary for fields derived from an xsd:element + if (!term.isElementDecl()) { + continue; + } + XSElementDecl element = term.asElementDecl(); + + // Do nothing if no default value + if (element.getDefaultValue() == null) { + continue; + } + String defaultValue = element.getDefaultValue().value; + + // Get handle to JModel representing the field + Map fields = co.implClass.fields(); + JFieldVar var = fields.get(fieldInfo.getName(false)); + + // Handle primitive types via boxed representation (treat boolean as java.lang.Boolean) + JType type = f.getRawType(); + if (type.isPrimitive()) + type = type.boxify(); + String typeFullName = type.fullName(); + + // Create an appropriate default expression depending on type + if ("java.lang.String".equals(typeFullName)) { + var.init(JExpr.lit(defaultValue)); + if (opt.verbose) + System.out.println("[INFO] Initializing String variable " + +fieldInfo.displayName() + +" to \""+defaultValue+"\""); + } + + else if ("java.lang.Boolean".equals(typeFullName)) { + var.init(JExpr.lit(Boolean.valueOf(defaultValue))); + if (opt.verbose) + System.out.println("[INFO] Initializing Boolean variable " + +fieldInfo.displayName() + +" to "+defaultValue+""); + } + + else if ( ("java.lang.Byte".equals(typeFullName)) + || ("java.lang.Short".equals(typeFullName)) + || ("java.lang.Integer".equals(typeFullName)) + ) { + // CodeModel does not distinguish between Byte, Short and Integer literals + var.init(JExpr.lit(Integer.valueOf(defaultValue))); + if (opt.verbose) + System.out.println("[INFO] Initializing Integer variable " + +fieldInfo.displayName() + +" to "+defaultValue+""); + } + + else if ("java.lang.Long".equals(typeFullName)) { + var.init(JExpr.lit(Long.valueOf(defaultValue))); + if (opt.verbose) + System.out.println("[INFO] Initializing Long variable " + +fieldInfo.displayName() + +" to "+defaultValue+""); + } + + else if ("java.lang.Float".equals(typeFullName)) { + var.init(JExpr.lit(Float.valueOf(defaultValue))); + if (opt.verbose) + System.out.println("[INFO] Initializing Float variable " + +fieldInfo.displayName() + +" to "+defaultValue+""); + } + + else if ( ("java.lang.Single".equals(typeFullName)) + || ("java.lang.Double".equals(typeFullName)) + ) { + // CodeModel does not distinguish between Single and Double literals + var.init(JExpr.lit(Double.valueOf(defaultValue))); + if (opt.verbose) + System.out.println("[INFO] Initializing Double variable " + +fieldInfo.displayName() + +" to "+defaultValue+""); + } + + else if ("javax.xml.datatype.XMLGregorianCalendar".equals(typeFullName)) { + // XMLGregorianCalender is constructed by DatatypeFactory, so we have to have + // an instance of that once per class + if (dtf == null) { + dtf = installDtF(co.implClass); + if (dtf == null) continue; + } + // Use our DtF instance to generate the initialization expression + var.init(JExpr.invoke(dtf, "newXMLGregorianCalendar") + .arg(defaultValue)); + if (opt.verbose) + System.out.println("[INFO] Initializing XMLGregorianCalendar variable " + +fieldInfo.displayName() + +" with value of "+defaultValue); + } + + else if ( (type instanceof JDefinedClass) + && (((JDefinedClass) type).getClassType() == ClassType.ENUM) ) { + // Find Enum constant + JEnumConstant constant = findEnumConstant(type, defaultValue, outline); + if (constant != null) { + var.init(constant); + if (opt.verbose) + System.out.println("[INFO] Initializing enum variable " + + fieldInfo.displayName() + " with constant " + constant.getName()); + } + } + + // Don't know how to create default for this type + else { + System.out.println("[WARN] Did not create default value for field " + + fieldInfo.displayName() + + ". Don't know how to create default value expression for fields of type " + + typeFullName + + ". Default value of \""+defaultValue+"\" specified in schema" + ); + } + + } // for FieldOutline + + } // for ClassOutline + + return true; + } + + + /** + * Retrieve the enum constant that correlates to the string value. + * @param enumType Type identifying an Enum in the code model + * @param enumStringValue Lexical value of the constant to search + * @param outline Outline of the code model + * @return The matching Constant from the enum type or NULL if not found + */ + private JEnumConstant findEnumConstant(JType enumType, String enumStringValue, Outline outline) + { + // Search all Enums generated + for (EnumOutline eo : outline.getEnums()) { + // Is it the type of my variable? + if (eo.clazz == enumType) { + // Search all Constants of that enum + for (EnumConstantOutline eco : eo.constants) { + // Is the enum generated from the XML defaut value string? + if (eco.target.getLexicalValue().equals(enumStringValue)) { + return eco.constRef; + } + } // for Constants + // Did not find the constant??? + System.out.println("[WARN] Could not find EnumConstant for value: "+enumStringValue); + return null; + } + } + // Did not find the type?? + System.out.println("[WARN] Could not find Enum class for type: "+enumType.fullName()); + return null; + } + + + /** + * Enhance the CodeModel of a Class to include a {@link DatatypeFactory} as a static private field. + * The factory is needed to construct {@link XMLGregorianCalendar} from String representation. + * @param parentClass Class where the DatatypeFactory will be created + * @return Reference to the created static field + */ + private JFieldVar installDtF(final JDefinedClass parentClass) + { + try { + JCodeModel cm = parentClass.owner(); + // Create a static variable of type DatatypeFactory + JClass dtfClass = cm.ref(DatatypeFactory.class); + JFieldVar dtf = parentClass.field(JMod.STATIC | JMod.FINAL | JMod.PRIVATE, + dtfClass, "DATATYPE_FACTORY"); + // Initialize variable in static block + JBlock si = parentClass.init(); + JTryBlock tryBlock = si._try(); + tryBlock.body().assign(dtf, dtfClass.staticInvoke("newInstance")); + // Catch exception & rethrow as unchecked Exception + JCatchBlock catchBlock = tryBlock._catch(cm.ref(DatatypeConfigurationException.class)); + JVar ex = catchBlock.param("ex"); + JClass runtimeException = cm.ref(RuntimeException.class); + catchBlock.body()._throw(JExpr._new(runtimeException) + .arg("Unable to initialize DatatypeFactory") + .arg(ex)); + // Return reference to initialized static field + return dtf; + } catch (Exception e) { + // We don't want JAXB to break of any plugin error + System.out.println("[ERROR] Failed to create code"); + e.printStackTrace(); + return null; + } + } + + +} diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/elementwrapper/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/elementwrapper/Customizations.java index 9a9ed3b8..ffc57068 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/elementwrapper/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.elementwrapper; +package org.jvnet.jaxb3_commons.plugin.elementwrapper; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/elementWrapper"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/elementWrapper"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/elementwrapper/ElementWrapperPlugin.java similarity index 88% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/elementwrapper/ElementWrapperPlugin.java index 0cd139d3..d1436a95 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/elementwrapper/ElementWrapperPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.elementwrapper; +package org.jvnet.jaxb3_commons.plugin.elementwrapper; import java.util.ArrayList; import java.util.Arrays; @@ -7,23 +7,23 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.model.AbstractModelPlugin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.DummyPropertyInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.util.DefaultPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.util.DefaultTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.DummyPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.util.DefaultPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.util.DefaultTypeInfoVisitor; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.model.AbstractModelPlugin; import org.xml.sax.ErrorHandler; import com.sun.tools.xjc.model.Model; @@ -76,7 +76,7 @@ public Void visitElementPropertyInfo( } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.elementwrapper.Customizations.IGNORED_ELEMENT_NAME); + org.jvnet.jaxb3_commons.plugin.elementwrapper.Customizations.IGNORED_ELEMENT_NAME); public Ignoring getIgnoring() { return ignoring; @@ -89,7 +89,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.elementwrapper.Customizations.IGNORED_ELEMENT_NAME); + .asList(org.jvnet.jaxb3_commons.plugin.elementwrapper.Customizations.IGNORED_ELEMENT_NAME); } protected void processWrapperElementPropertyInfo( diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/enumvalue/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/enumvalue/Customizations.java index 8710a1ec..69cdb8d2 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/enumvalue/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.enumvalue; +package org.jvnet.jaxb3_commons.plugin.enumvalue; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/enumvalue"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/enumvalue"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/enumvalue/EnumValuePlugin.java similarity index 79% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/enumvalue/EnumValuePlugin.java index f30c7250..40660c26 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/enumvalue/EnumValuePlugin.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.plugin.enumvalue; +package org.jvnet.jaxb3_commons.plugin.enumvalue; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.EnumValue; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.lang.EnumValue; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JClass; @@ -33,11 +33,11 @@ public String getOptionName() { @Override public String getUsage() { - return "Forces generated @XmlEnums implement the org.jvnet.jaxb2_commons.lang.EnumValue interface."; + return "Forces generated @XmlEnums implement the org.jvnet.jaxb3_commons.lang.EnumValue interface."; } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -52,7 +52,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/equals/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/equals/Customizations.java index d4a2d62f..a2ee1a92 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/equals/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.equals; +package org.jvnet.jaxb3_commons.plugin.equals; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/equals"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/equals"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/equals/EqualsPlugin.java similarity index 87% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/equals/EqualsPlugin.java index 2b30aaa2..35915d8a 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/equals/EqualsPlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.equals; +package org.jvnet.jaxb3_commons.plugin.equals; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Equals2; -import org.jvnet.jaxb2_commons.lang.EqualsStrategy2; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.ClassUtils; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.lang.Equals2; +import org.jvnet.jaxb3_commons.lang.EqualsStrategy2; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.util.LocatorUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JBlock; @@ -75,7 +75,7 @@ public JExpression createEqualsStrategy(JCodeModel codeModel) { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -90,7 +90,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java similarity index 95% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java index e2e6cf81..df424397 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.plugin.fixjaxb1058; +package org.jvnet.jaxb3_commons.plugin.fixjaxb1058; -import org.jvnet.jaxb2_commons.reflection.util.Accessor; -import org.jvnet.jaxb2_commons.reflection.util.FieldAccessor; +import org.jvnet.jaxb3_commons.reflection.util.Accessor; +import org.jvnet.jaxb3_commons.reflection.util.FieldAccessor; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/Customizations.java new file mode 100644 index 00000000..15dfc578 --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/Customizations.java @@ -0,0 +1,12 @@ +package org.jvnet.jaxb3_commons.plugin.fluent_api; + +import javax.xml.namespace.QName; + +public class Customizations { + + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/fluent-api"; + + public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, + "ignored"); + +} diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentApiPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentApiPlugin.java new file mode 100644 index 00000000..2003c152 --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentApiPlugin.java @@ -0,0 +1,235 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jvnet.jaxb3_commons.plugin.fluent_api; + +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.FLUENT_COLLECTION_SETTER; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.FLUENT_LIST_SETTER; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.FLUENT_SETTER; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.GETTER_METHOD_PREFIX; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.GETTER_METHOD_PREFIX_LEN; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.PARAMETERIZED_LIST_PREFIX; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.SETTER_METHOD_PREFIX; +import static org.jvnet.jaxb3_commons.plugin.fluent_api.FluentMethodType.SETTER_METHOD_PREFIX_LEN; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.xml.sax.ErrorHandler; + +import com.sun.codemodel.JClass; +import com.sun.codemodel.JCodeModel; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JMethod; +import com.sun.codemodel.JMod; +import com.sun.codemodel.JType; +import com.sun.codemodel.JVar; +import com.sun.tools.xjc.Plugin; +import com.sun.tools.xjc.Options; +import com.sun.tools.xjc.outline.ClassOutline; +import com.sun.tools.xjc.outline.Outline; + +/** + * Support a fluent api in addition to the default (JavaBean) setter methods.
+ *

+ * The initial idea is simply to add a "with*" method to the generated class + * for every "set*" method encountered, + * with the only functional difference of returning the class instance, instead of void. + *

+ * Enhancement on 11 June 2006:
+ * Provide fluent setter api for Lists, with support of variable arguments. + * + * This enhancement was suggested by Kenny MacLeod , + * and endorsed by Kohsuke Kawaguchi . + * Here is quoted from the original request: + *

+ * By default, XJC represents Lists by generating a getter method, but no setter. + * This is impossible to chain with fluent-api. + * How about the plugin generates a withXYZ() method for List properties, + * taking as it's parameters a vararg list. For example:

+ * // This method is generated by vanilla XJC
+ * public List<OtherType> getMyList() {
+ *   if (myList == null) {
+ *     myList = new ArrayList<OtherType>();
+ *   }
+ *   return myList;
+ * }
+ *
+ * // This would be generated by fluent-api
+ * public MyClass withMyList(OtherType... values) {
+ *   if (values!= null) {
+ *       for(OtherType value : values) {
+ *         getMyList().add(value);
+ *       }
+ *   }
+ *   return this;
+ * }
+ *
+ * Enhancement on 11 Oct 2008:
+ * Provide fluent setter api for Lists, with support of Collection argument in addition to varargs arguments. + * + * This enhancement was suggested by Alex Wei with patch submitted. See + * Jira Issue 12 for more details. + *

+ * @author Hanson Char + */ +public class FluentApiPlugin extends Plugin +{ + @Override + public String getOptionName() + { + return "Xfluent-api"; + } + + @Override + public String getUsage() + { + return " -Xfluent-api : enable fluent api for generated code"; + } + + @Override + public boolean run(Outline outline, + @SuppressWarnings("unused") Options opt, + @SuppressWarnings("unused") ErrorHandler errorHandler) + { + final JType voidType = outline.getCodeModel().VOID; + // Process every pojo class generated by jaxb + for (ClassOutline classOutline : outline.getClasses()) { + final JDefinedClass targetImplClass = classOutline.implClass; + Collection fluentMethodInfoList = new ArrayList(); + Set methodNames = new HashSet(); + boolean isOverride = false; + + for (;;) { + JDefinedClass implClass = classOutline.implClass; + // Collect the methods we are interested in + // but defer the respective fluent methods creation + // to avoid ConcurrentModificationException + for (JMethod jmethod : implClass.methods()) + { + if (methodNames.contains(jmethod.name())) + continue; + if (isSetterMethod(jmethod, voidType)) { + fluentMethodInfoList.add(new FluentMethodInfo(jmethod, FLUENT_SETTER, isOverride)); + methodNames.add(jmethod.name()); + } + else if (isListGetterMethod(jmethod)) { + fluentMethodInfoList.add(new FluentMethodInfo(jmethod, FLUENT_LIST_SETTER, isOverride)); + // Originally proposed by Alex Wei ozgwei@dev.java.net: + // https://jaxb2-commons.dev.java.net/issues/show_bug.cgi?id=12 + fluentMethodInfoList.add(new FluentMethodInfo(jmethod, FLUENT_COLLECTION_SETTER, isOverride)); + methodNames.add(jmethod.name()); + } + } + // Let's climb up the class hierarchy + classOutline = classOutline.getSuperClass(); + + if (classOutline == null) + break; + isOverride = true; + } + // Generate a respective fluent method for each setter method + for (FluentMethodInfo fluentMethodInfo : fluentMethodInfoList) + fluentMethodInfo.createFluentMethod(targetImplClass); + } + return true; + } + + /** + * Returns true if the given method is a public non-static setter method that follows + * the JavaBean convention; false otherwise. + * The setter method can either be a simple property setter method or + * an indexed property setter method. + */ + private boolean isSetterMethod(JMethod jmethod, final JType VOID) + { + // Return type of a setter method is expected to be void. + if (jmethod.type() == VOID) { + JVar[] jvars = jmethod.listParams(); + + switch(jvars.length) { + case 2: + // could be an indexed property setter method. + // if so, the first argument must be the index (a primitive int). + if (!isInt(jvars[0].type())) + return false; + // drop thru. + case 1: + // or could be a simple property setter method + int mods = jmethod.mods().getValue(); + + if ((mods & JMod.STATIC) == 0 + && (mods & JMod.PUBLIC) == 1) + { + String methodName = jmethod.name(); + return methodName.length() > SETTER_METHOD_PREFIX_LEN + && methodName.startsWith(SETTER_METHOD_PREFIX); + } + break; + } + } + return false; + } + + /** + * Returns true if the given method is a public non-static getter method that returns + * a List; false otherwise. + * + * @param jmethod given method + */ + private boolean isListGetterMethod(JMethod jmethod) + { + int mods = jmethod.mods().getValue(); + // check if it is a non-static public method + if ((mods & JMod.STATIC) == 1 + || (mods & JMod.PUBLIC) == 0) + return false; + String methodName = jmethod.name(); + // See if the method name looks like a getter method + if (methodName.length() <= GETTER_METHOD_PREFIX_LEN + || !methodName.startsWith(GETTER_METHOD_PREFIX)) + return false; + // A list getter method will have no argument. + if (jmethod.listParams().length > 0) + return false; + // See if the return type of the method + // is a List + JType jtype = jmethod.type(); + + if (jtype instanceof JClass) + { + JClass jclass = JClass.class.cast(jtype); + List typeParams = jclass.getTypeParameters(); + + if (typeParams.size() != 1) + return false; + return jclass.fullName().startsWith(PARAMETERIZED_LIST_PREFIX); + } + return false; + } + + /** Returns true if the given type is a primitive int; false otherwise. */ + private boolean isInt(JType type) + { + JCodeModel codeModel = type.owner(); + return type.isPrimitive() + && codeModel.INT.equals( + JType.parse(codeModel, type.name())); + } +} \ No newline at end of file diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentMethodInfo.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentMethodInfo.java new file mode 100644 index 00000000..4e72ccbf --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentMethodInfo.java @@ -0,0 +1,55 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jvnet.jaxb3_commons.plugin.fluent_api; + +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JMethod; + +/** + * Information used to generate a fluent API method. + * + * @author Hanson Char + */ +public class FluentMethodInfo { + // Original method to used to derive the fluent API method. + private final JMethod jmethod; + // True if this method will be overriding a parent method; false otherwise. + private final boolean isOverride; + // Type of fluent API method to be generated. + private final FluentMethodType fluentMethodType; + + public FluentMethodInfo(JMethod jmethod, FluentMethodType fluentMethodType, boolean isOverride) + { + this.jmethod = jmethod; + this.fluentMethodType = fluentMethodType; + this.isOverride = isOverride; + } + + /** Creates a fluent API method in the given class. */ + public void createFluentMethod(JDefinedClass implClass) { + fluentMethodType.createFluentMethod(implClass, this); + } + + /** Returns true if the fluent API method is one overriding a parent method. */ + public boolean isOverride() { + return isOverride; + } + + /** Returns the original method for which a fluent API method will be generated. */ + public JMethod getJmethod() { + return jmethod; + } +} \ No newline at end of file diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentMethodType.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentMethodType.java new file mode 100644 index 00000000..adf0d59b --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/fluent_api/FluentMethodType.java @@ -0,0 +1,172 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jvnet.jaxb3_commons.plugin.fluent_api; + +import java.util.Collection; +import java.util.List; + +import com.sun.codemodel.JBlock; +import com.sun.codemodel.JClass; +import com.sun.codemodel.JConditional; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JExpr; +import com.sun.codemodel.JForEach; +import com.sun.codemodel.JInvocation; +import com.sun.codemodel.JMethod; +import com.sun.codemodel.JMod; +import com.sun.codemodel.JType; +import com.sun.codemodel.JVar; + +/** + * @author Hanson Char + */ +public enum FluentMethodType { + FLUENT_SETTER + { + /** + * Adds a fluent api method, which invokes the given setter method, to the given class. + * This applies to both simple property setter method and + * indexed property setter method. + */ + @Override + public void createFluentMethod(JDefinedClass implClass, FluentMethodInfo fluentMethodInfo) + { + JMethod setterMethod = fluentMethodInfo.getJmethod(); + String name = setterMethod.name(); + // Create a with* method for the respective set* method. + int mods = JMod.PUBLIC | setterMethod.mods().getValue() & JMod.FINAL; + JMethod fluentMethod = implClass.method(mods, implClass, + FLUENT_SETTER_METHOD_PREFIX + name.substring(SETTER_METHOD_PREFIX_LEN)); + if (fluentMethodInfo.isOverride()) + fluentMethod.annotate(Override.class); + JVar[] jvars = setterMethod.listParams(); + // jvars.length == 1 means simple property setter method. + // jvars.length == 2 means indexed property setter method. + assert jvars.length == 1 || jvars.length == 2; + // with the same parameter(s) as the set* method + for (JVar jvar : jvars) + fluentMethod.param(jvar.mods().getValue(), jvar.type(), jvar.name()); + JBlock jblock = fluentMethod.body(); + // The with* method in turn invoke the setter method + JInvocation jinvocation = jblock.invoke(setterMethod); + // passing the same list of arguments + for (JVar jvar : jvars) + jinvocation.arg(jvar); + // and return "this" + jblock._return(JExpr._this()); + return; + } + }, + FLUENT_LIST_SETTER + { + /** + * Create a fluent setter method for List, with support of variable arguments. + */ + @Override + public void createFluentMethod(JDefinedClass implClass, FluentMethodInfo fluentMethodInfo) + { + JMethod listGetterMethod = fluentMethodInfo.getJmethod(); + String name = listGetterMethod.name(); + // Create a with* method for the respective List get* method. + int mods = JMod.PUBLIC | listGetterMethod.mods().getValue() & JMod.FINAL; + JMethod fluentMethod = implClass.method(mods, implClass, + FLUENT_SETTER_METHOD_PREFIX + name.substring(GETTER_METHOD_PREFIX_LEN)); + if (fluentMethodInfo.isOverride()) + fluentMethod.annotate(Override.class); + JType returnJType = listGetterMethod.type(); + // As is already checked in isListGetterMethod(JMethod): + // 1) the return type must be a subtype of JClass; and + // 2) the number of type parameters must be 1 + JClass returnJClass = JClass.class.cast(returnJType); + List typeParams = returnJClass.getTypeParameters(); + assert typeParams.size() == 1; + JClass typeParam = typeParams.get(0); + // Support variable arguments + JVar jvarParam = fluentMethod.varParam(typeParam, VALUES); + JBlock body = fluentMethod.body(); + JConditional cond = body._if( + jvarParam.ne( + JExpr._null())); + JForEach forEach = cond._then() + .forEach( + typeParam, VALUE, JExpr.ref(VALUES)); + JInvocation addInvocation = forEach.body() + .invoke( + JExpr.invoke(listGetterMethod), "add"); + addInvocation.arg( + JExpr.ref(VALUE)); + // and return "this" + body._return( + JExpr._this()); + return; + } + }, + FLUENT_COLLECTION_SETTER + { + // Originally proposed by Alex Wei ozgwei@dev.java.net: + // https://jaxb2-commons.dev.java.net/issues/show_bug.cgi?id=12 + /** + * Create a fluent setter method for List, with support of a java.util.Collection argument. + */ + @Override + public void createFluentMethod(JDefinedClass implClass, FluentMethodInfo fluentMethodInfo) + { + JMethod listGetterMethod = fluentMethodInfo.getJmethod(); + String name = listGetterMethod.name(); + // Create a with* method for the respective List get* method. + int mods = JMod.PUBLIC | listGetterMethod.mods().getValue() & JMod.FINAL; + JMethod fluentMethod = implClass.method(mods, implClass, + FLUENT_SETTER_METHOD_PREFIX + name.substring(GETTER_METHOD_PREFIX_LEN)); + if (fluentMethodInfo.isOverride()) + fluentMethod.annotate(Override.class); + JType returnJType = listGetterMethod.type(); + // As is already checked in isListGetterMethod(JMethod): + // 1) the return type must be a subtype of JClass; and + // 2) the number of type parameters must be 1 + JClass returnJClass = JClass.class.cast(returnJType); + List typeParams = returnJClass.getTypeParameters(); + assert typeParams.size() == 1; + JClass typeParam = typeParams.get(0); + // Support Collection with type parameter + JClass narrowedCollectionJClass = implClass.owner().ref(Collection.class).narrow(typeParam); + JVar jvarParam = fluentMethod.param(narrowedCollectionJClass, VALUES); + JBlock body = fluentMethod.body(); + JConditional cond = body._if( + jvarParam.ne( + JExpr._null())); + JInvocation addInvocation = cond._then() + .invoke( + JExpr.invoke(listGetterMethod), "addAll"); + addInvocation.arg(jvarParam); + // and return "this" + body._return( + JExpr._this()); + return; + } + } + ; + private static final String VALUE = "value"; + private static final String VALUES = "values"; + public static final String GETTER_METHOD_PREFIX = "get"; + public static final String SETTER_METHOD_PREFIX = "set"; + public static final String FLUENT_SETTER_METHOD_PREFIX = "with"; + public static final String PARAMETERIZED_LIST_PREFIX = List.class.getName() + "<"; + + public static final int SETTER_METHOD_PREFIX_LEN = SETTER_METHOD_PREFIX.length(); + public static final int GETTER_METHOD_PREFIX_LEN = GETTER_METHOD_PREFIX.length(); + + public abstract void createFluentMethod(JDefinedClass implClass, FluentMethodInfo fluentMethodInfo); +} \ No newline at end of file diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/hashcode/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/hashcode/Customizations.java index 8ac13732..8aaed08b 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/hashcode/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.hashcode; +package org.jvnet.jaxb3_commons.plugin.hashcode; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/hashCode"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/hashCode"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/hashcode/HashCodePlugin.java similarity index 85% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/hashcode/HashCodePlugin.java index 9454991c..b5f25a06 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/hashcode/HashCodePlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.hashcode; +package org.jvnet.jaxb3_commons.plugin.hashcode; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.HashCode2; -import org.jvnet.jaxb2_commons.lang.HashCodeStrategy2; -import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.ClassUtils; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.lang.HashCode2; +import org.jvnet.jaxb3_commons.lang.HashCodeStrategy2; +import org.jvnet.jaxb3_commons.lang.JAXBHashCodeStrategy; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.util.LocatorUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JBlock; @@ -74,7 +74,7 @@ public JExpression createHashCodeStrategy(JCodeModel codeModel) { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -89,7 +89,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/Customizations.java similarity index 87% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/Customizations.java index e04c9713..d15813c3 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/Customizations.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb3_commons.plugin.inheritance; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.util.CustomizationUtils; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CPluginCustomization; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/inheritance"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/inheritance"; public static QName OBJECT_FACTORY_ELEMENT_NAME = new QName(NAMESPACE_URI, "objectFactory"); diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ExtendsClass.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ExtendsClass.java new file mode 100644 index 00000000..1473d528 --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ExtendsClass.java @@ -0,0 +1,26 @@ +package org.jvnet.jaxb3_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; + +@XmlRootElement(namespace = "http://jaxb3-commons.dev.java.net/basic/inheritance", name = "extends") +@XmlAccessorType(XmlAccessType.PROPERTY) +public class ExtendsClass { + + private String className; + + @XmlValue + @XmlJavaTypeAdapter(value = CollapsedStringAdapter.class) + String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + +} diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ImplementsInterface.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ImplementsInterface.java new file mode 100644 index 00000000..4924f31f --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ImplementsInterface.java @@ -0,0 +1,26 @@ +package org.jvnet.jaxb3_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; + +@XmlRootElement(namespace = "http://jaxb3-commons.dev.java.net/basic/inheritance", name = "implements") +@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) +public class ImplementsInterface { + + private String interfaceName; + + @XmlValue + @XmlJavaTypeAdapter(value = CollapsedStringAdapter.class) + public String getInterfaceName() { + return interfaceName; + } + + public void setInterfaceName(String interfaceName) { + this.interfaceName = interfaceName; + } + +} diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/InheritancePlugin.java similarity index 97% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/InheritancePlugin.java index 2ddb9213..8767bcca 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/InheritancePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb3_commons.plugin.inheritance; import java.util.ArrayList; import java.util.Arrays; @@ -10,9 +10,9 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.inheritance.util.JavaTypeParser; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.plugin.inheritance.util.JavaTypeParser; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JClass; @@ -271,7 +271,7 @@ private List generateImplements(final JDefinedClass theClass, for (final CPluginCustomization implementsInterfaceCustomization : implementsInterfaceCustomizations) { if (implementsInterfaceCustomization != null) { - final ImplementsInterface implementsInterface = (ImplementsInterface) org.jvnet.jaxb2_commons.util.CustomizationUtils + final ImplementsInterface implementsInterface = (ImplementsInterface) org.jvnet.jaxb3_commons.util.CustomizationUtils .unmarshall(Customizations.getContext(), implementsInterfaceCustomization); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ObjectFactory.java similarity index 77% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ObjectFactory.java index 98b29f2a..e5aa9ea1 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ObjectFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb3_commons.plugin.inheritance; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry public class ObjectFactory { diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ObjectFactoryCustomization.java similarity index 66% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ObjectFactoryCustomization.java index a4a34530..4911e12d 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/ObjectFactoryCustomization.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb3_commons.plugin.inheritance; import java.util.ArrayList; import java.util.List; -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; +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; -@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "objectFactory") +@XmlRootElement(namespace = "http://jaxb3-commons.dev.java.net/basic/inheritance", name = "objectFactory") @XmlType(propOrder = { "extendsClass", "implementsInterface" }) @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) public class ObjectFactoryCustomization { @@ -28,7 +28,7 @@ public void setPackageName(String packageName) { private ExtendsClass extendsClass; - @XmlElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "extends") + @XmlElement(namespace = "http://jaxb3-commons.dev.java.net/basic/inheritance", name = "extends") public ExtendsClass getExtendsClass() { return extendsClass; } @@ -39,7 +39,7 @@ public void setExtendsClass(ExtendsClass extendsClass) { private List implementsInterface = new ArrayList(); - @XmlElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "implements") + @XmlElement(namespace = "http://jaxb3-commons.dev.java.net/basic/inheritance", name = "implements") public List getImplementsInterface() { return implementsInterface; } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/util/JavaTypeParser.java similarity index 97% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/util/JavaTypeParser.java index 2d5d07a6..e0412d8d 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/util/JavaTypeParser.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.util; +package org.jvnet.jaxb3_commons.plugin.inheritance.util; import japa.parser.JavaParser; import japa.parser.ParseException; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java similarity index 98% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java index 5b8a4b7d..20fcd503 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.util; +package org.jvnet.jaxb3_commons.plugin.inheritance.util; import japa.parser.ast.type.ClassOrInterfaceType; import japa.parser.ast.type.PrimitiveType; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/jaxbindex/JaxbIndexPlugin.java similarity index 91% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/jaxbindex/JaxbIndexPlugin.java index 7963b722..f4b39bd3 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/jaxbindex/JaxbIndexPlugin.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.plugin.jaxbindex; +package org.jvnet.jaxb3_commons.plugin.jaxbindex; -import org.jvnet.jaxb2_commons.util.CodeModelUtils; +import org.jvnet.jaxb3_commons.util.CodeModelUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.fmt.JTextFile; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/mergeable/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/mergeable/Customizations.java index 72fad319..5d0d4b5f 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/mergeable/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.mergeable; +package org.jvnet.jaxb3_commons.plugin.mergeable; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/mergeable"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/mergeable"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/mergeable/MergeablePlugin.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/mergeable/MergeablePlugin.java index 7edec3d1..20f67116 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/mergeable/MergeablePlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.mergeable; +package org.jvnet.jaxb3_commons.plugin.mergeable; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.JAXBMergeStrategy; -import org.jvnet.jaxb2_commons.lang.MergeFrom2; -import org.jvnet.jaxb2_commons.lang.MergeStrategy2; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.ClassUtils; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.lang.JAXBMergeStrategy; +import org.jvnet.jaxb3_commons.lang.MergeFrom2; +import org.jvnet.jaxb3_commons.lang.MergeStrategy2; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.util.LocatorUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JBlock; @@ -77,7 +77,7 @@ public JExpression createMergeStrategy(JCodeModel codeModel) { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.mergeable.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.mergeable.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -92,7 +92,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.mergeable.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.mergeable.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/model/AbstractModelPlugin.java similarity index 85% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/model/AbstractModelPlugin.java index 986a34b7..d2ade4c5 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/model/AbstractModelPlugin.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.plugin.model; +package org.jvnet.jaxb3_commons.plugin.model; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.xjc.generator.MModelOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.ModelOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xjc.model.concrete.XJCCMInfoFactory; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.xjc.generator.MModelOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.ModelOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xjc.model.concrete.XJCCMInfoFactory; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import org.xml.sax.ErrorHandler; import com.sun.tools.xjc.Options; diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java new file mode 100644 index 00000000..668e125a --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java @@ -0,0 +1,337 @@ +package org.jvnet.jaxb3_commons.plugin.namespace_prefix; + +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.sun.codemodel.JAnnotationArrayMember; +import com.sun.codemodel.JAnnotationUse; +import com.sun.codemodel.JAnnotationValue; +import com.sun.codemodel.JClass; +import com.sun.codemodel.JPackage; +import com.sun.codemodel.JStringLiteral; +import com.sun.tools.xjc.Options; +import com.sun.tools.xjc.Plugin; +import com.sun.tools.xjc.generator.bean.PackageOutlineImpl; +import com.sun.tools.xjc.model.CCustomizations; +import com.sun.tools.xjc.model.CPluginCustomization; +import com.sun.tools.xjc.model.Model; +import com.sun.tools.xjc.outline.Outline; +import com.sun.tools.xjc.outline.PackageOutline; +import com.sun.tools.xjc.reader.xmlschema.bindinfo.BIDeclaration; +import com.sun.tools.xjc.reader.xmlschema.bindinfo.BIXPluginCustomization; +import com.sun.tools.xjc.reader.xmlschema.bindinfo.BindInfo; +import com.sun.xml.xsom.XSAnnotation; +import com.sun.xml.xsom.XSSchema; +import com.sun.xml.xsom.impl.SchemaImpl; +import org.xml.sax.ErrorHandler; + +/** + * This plugin adds {@link jakarta.xml.bind.annotation.XmlNs} annotations to package-info.java files. Those annotations tells Jaxb to generate XML schema's instances with specific namespaces + * prefixes, instead of the auto-generated (ns1, ns2, ...) prefixes. Definition of thoses prefixes is done in the bindings.xml file. + *

+ * Bindings.xml file example: + * 

+ *  <?xml version="1.0"?>
+ *  <jxb:bindings version="3.0"
+ *      xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
+ *      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ *      xmlns:namespace="http://jaxb3-commons.dev.java.net/basic/namespace-prefix">
+ *
+ *      <jxb:bindings schemaLocation="unireg-common-1.xsd">
+ *          <jxb:schemaBindings>
+ *              <jxb:package name="ch.vd.unireg.xml.common.v1" />
+ *          </jxb:schemaBindings>
+ *          <jxb:bindings>
+ *              <namespace:prefix name="common-1" />
+ *          </jxb:bindings>
+ *      </jxb:bindings>
+ *
+ *  </jxb:bindings>
+ *
+ * + * @author Manuel Siggen (c) 2012 Etat-de-Vaud (www.vd.ch) + */ +@SuppressWarnings("UnusedDeclaration") +public class NamespacePrefixPlugin extends Plugin { + + private static final String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/namespace-prefix"; + + @Override + public String getOptionName() { + return "Xnamespace-prefix"; + } + + @Override + public String getUsage() { + return "-Xnamespace-prefix : activate namespaces prefix customizations"; + } + + @Override + public List getCustomizationURIs() { + return Arrays.asList(NAMESPACE_URI); + } + + @Override + public boolean isCustomizationTagName(String nsUri, String localName) { + return NAMESPACE_URI.equals(nsUri) && "prefix".equals(localName); + } + + @Override + public boolean run(final Outline outline, final Options options, final ErrorHandler errorHandler) { + + final JClass xmlNsClass = outline.getCodeModel().ref(XmlNs.class); + final JClass xmlSchemaClass = outline.getCodeModel().ref(XmlSchema.class); + + for (PackageOutline packageOutline : outline.getAllPackageContexts()) { + final JPackage p = packageOutline._package(); + + // get the target namespaces of all schemas that bind to the current package + final Set packageNamespaces = getPackageNamespace(packageOutline); + + // is there any prefix binding defined for the current package ? + final Model packageModel = getPackageModel((PackageOutlineImpl) packageOutline); + final List list = getPrefixBinding(packageModel, packageNamespaces); + acknowledgePrefixAnnotations(packageModel); + + if (list == null || list.isEmpty()) { + // no prefix binding, nothing to do + continue; + } + + // add XML namespace prefix annotations + final JAnnotationUse xmlSchemaAnnotation = getOrAddXmlSchemaAnnotation(p, xmlSchemaClass); + if (xmlSchemaAnnotation == null) { + throw new RuntimeException("Unable to get/add 'XmlSchema' annotation to package [" + p.name() + "]"); + } + + final JAnnotationArrayMember members = xmlSchemaAnnotation.paramArray("xmlns"); + for (Pair pair : list) { + addNamespacePrefix(xmlNsClass, members, pair.getNamespace(), pair.getPrefix()); + } + } + + return true; + } + + private static Set getPackageNamespace(PackageOutline packageOutline) { + final Map map = getUriCountMap(packageOutline); + return map == null ? Collections.emptySet() : map.keySet(); + } + + /** + * Make sure the prefix annotations have been acknowledged. + * + * @param packageModel the package model + */ + private void acknowledgePrefixAnnotations(Model packageModel) { + final CCustomizations customizations = packageModel.getCustomizations(); + if (customizations != null) { + for (CPluginCustomization customization : customizations) { + if (customization.element.getNamespaceURI().equals(NAMESPACE_URI)) { + if (!customization.element.getLocalName().equals("prefix")) { + throw new RuntimeException("Unrecognized element [" + customization.element.getLocalName() + "]"); + } + customization.markAsAcknowledged(); + } + } + } + } + + /** + * This method detects prefixes for a given package as specified in the bindings file. Usually, there is only one namespace per package, but there may be more. + * + * @param packageModel the package model + * @param packageNamespace the target namespace for the package + * @return the prefix annotations + */ + private static List getPrefixBinding(Model packageModel, Set packageNamespace) { + + final List list = new ArrayList(); + + // loop on existing schemas (XSD files) + for (XSSchema schema : packageModel.schemaComponent.getSchemas()) { + + final SchemaImpl s = (SchemaImpl) schema; + final XSAnnotation annotation = s.getAnnotation(); + if (annotation == null) { + continue; + } + + final Object anno = annotation.getAnnotation(); + if (anno == null || !(anno instanceof BindInfo)) { + continue; + } + + final BindInfo b = (BindInfo) anno; + final String targetNS = b.getOwner().getOwnerSchema().getTargetNamespace(); + + if (!packageNamespace.contains(targetNS)) { // only consider schemas that bind the current package + continue; + } + + // get the prefix's name + String prefix = ""; + for (BIDeclaration declaration : b.getDecls()) { + if (declaration instanceof BIXPluginCustomization) { + final BIXPluginCustomization customization = (BIXPluginCustomization) declaration; + if (customization.element.getNamespaceURI().equals(NAMESPACE_URI)) { + if (!customization.element.getLocalName().equals("prefix")) { + throw new RuntimeException("Unrecognized element [" + customization.element.getLocalName() + "]"); + } + prefix = customization.element.getAttribute("name"); + customization.markAsAcknowledged(); + break; + } + } + } + + list.add(new Pair(targetNS, prefix)); + } + + return list; + } + + private static void addNamespacePrefix(JClass xmlNsClass, JAnnotationArrayMember members, String namespace, String prefix) { + final JAnnotationUse ns = members.annotate(xmlNsClass); + ns.param("namespaceURI", namespace); + ns.param("prefix", prefix); + } + + @SuppressWarnings("unchecked") + private static JAnnotationUse getOrAddXmlSchemaAnnotation(JPackage p, JClass xmlSchemaClass) { + + JAnnotationUse xmlAnn = null; + + final List annotations = getAnnotations(p); + if (annotations != null) { + for (JAnnotationUse annotation : annotations) { + final JClass clazz = getAnnotationJClass(annotation); + if (clazz == xmlSchemaClass) { + xmlAnn = annotation; + break; + } + } + } + + if (xmlAnn == null) { + // XmlSchema annotation not found, let's add one + xmlAnn = p.annotate(xmlSchemaClass); + } + + return xmlAnn; + } + + @SuppressWarnings("unchecked") + private static Map getUriCountMap(PackageOutline packageOutline) { + try { + final Field field = PackageOutlineImpl.class.getDeclaredField("uriCountMap"); + field.setAccessible(true); + return (Map) field.get(packageOutline); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to access 'uriCountMap' field for package outline [" + packageOutline._package().name() + "] : " + e.getMessage(), e); + } + catch (IllegalAccessException e) { + throw new RuntimeException("Unable to find 'uriCountMap' field for package outline [" + packageOutline._package().name() + "] : " + e.getMessage(), e); + } + } + + private static Model getPackageModel(PackageOutlineImpl packageOutline) { + try { + final Field field = PackageOutlineImpl.class.getDeclaredField("_model"); + field.setAccessible(true); + return (Model) field.get(packageOutline); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to access '_model' field for package outline [" + packageOutline._package().name() + "] : " + e.getMessage(), e); + } + catch (IllegalAccessException e) { + throw new RuntimeException("Unable to find '_model' field for package outline [" + packageOutline._package().name() + "] : " + e.getMessage(), e); + } + } + + @SuppressWarnings("unchecked") + private static List getAnnotations(JPackage p) { + // TODO bump jaxb-xjc dependency to version >= 2.2.2 and use the annotations() method instead. + try { + final Field annotationsField = JPackage.class.getDeclaredField("annotations"); + annotationsField.setAccessible(true); + return (List) annotationsField.get(p); + } + catch (IllegalAccessException e) { + throw new RuntimeException("Unable to access 'annotation' field for package [" + p.name() + "] : " + e.getMessage(), e); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to find 'annotation' field for package [" + p.name() + "] : " + e.getMessage(), e); + } + } + + private static JClass getAnnotationJClass(JAnnotationUse annotation) { + try { + final Field clazzField = JAnnotationUse.class.getDeclaredField("clazz"); + clazzField.setAccessible(true); + return (JClass) clazzField.get(annotation); + } + catch (IllegalAccessException e) { + throw new RuntimeException("Unable to access 'clazz' field for class [JAnnotationUse] : " + e.getMessage(), e); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to find 'annotation' field for class [JAnnotationUse] : " + e.getMessage(), e); + } + } + + @SuppressWarnings("unchecked") + private static Map getAnnotationMemberValues(JAnnotationUse annotation) { + try { + final Field clazzField = JAnnotationUse.class.getDeclaredField("memberValues"); + clazzField.setAccessible(true); + return (Map) clazzField.get(annotation); + } + catch (IllegalAccessException e) { + throw new RuntimeException("Unable to access 'memberValues' field for class [JAnnotationUse] : " + e.getMessage(), e); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to find 'memberValues' field for class [JAnnotationUse] : " + e.getMessage(), e); + } + } + + private static String getStringAnnotationValue(JAnnotationValue val) { + try { + final Field clazzField = val.getClass().getDeclaredField("value"); + clazzField.setAccessible(true); + final JStringLiteral j = (JStringLiteral) clazzField.get(val); + return j == null ? null : j.str; + } + catch (IllegalAccessException e) { + throw new RuntimeException("Unable to access 'value' field for class [" + val.getClass() + "] : " + e.getMessage(), e); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to find 'value' field for class [" + val.getClass() + "] : " + e.getMessage(), e); + } + } + + private static class Pair { + private final String namespace; + private final String prefix; + + private Pair(String namespace, String prefix) { + this.namespace = namespace; + this.prefix = prefix; + } + + public String getNamespace() { + return namespace; + } + + public String getPrefix() { + return prefix; + } + } +} diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/setters/Customizations.java similarity index 62% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/setters/Customizations.java index 104e1c22..c4183eb1 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/setters/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.setters; +package org.jvnet.jaxb3_commons.plugin.setters; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/collectionsetters"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/collectionsetters"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/setters/SettersPlugin.java similarity index 91% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/setters/SettersPlugin.java index fa69121f..5809cb86 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/setters/SettersPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.setters; +package org.jvnet.jaxb3_commons.plugin.setters; import java.util.Arrays; import java.util.Collection; @@ -6,10 +6,10 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JDefinedClass; @@ -149,7 +149,7 @@ private void generateSetters(ClassOutline classOutline, } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.setters.Customizations.IGNORED_ELEMENT_NAME); + org.jvnet.jaxb3_commons.plugin.setters.Customizations.IGNORED_ELEMENT_NAME); public Ignoring getIgnoring() { return ignoring; @@ -162,7 +162,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.setters.Customizations.IGNORED_ELEMENT_NAME); + .asList(org.jvnet.jaxb3_commons.plugin.setters.Customizations.IGNORED_ELEMENT_NAME); } } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsArguments.java similarity index 98% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsArguments.java index 1193d349..3839abbf 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsArguments.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb3_commons.plugin.simpleequals; import java.util.Collection; import java.util.ListIterator; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.codegenerator.Arguments; +import org.jvnet.jaxb3_commons.plugin.codegenerator.Arguments; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java similarity index 96% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java index ec98bcfb..7d7fd0c7 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb3_commons.plugin.simpleequals; import java.util.Arrays; -import org.jvnet.jaxb2_commons.plugin.codegenerator.AbstractCodeGenerationImplementor; +import org.jvnet.jaxb3_commons.plugin.codegenerator.AbstractCodeGenerationImplementor; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsCodeGenerator.java similarity index 73% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsCodeGenerator.java index 7be7bd0c..182f47a5 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/EqualsCodeGenerator.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb3_commons.plugin.simpleequals; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.codegenerator.CodeGenerationAbstraction; +import org.jvnet.jaxb3_commons.plugin.codegenerator.CodeGenerationAbstraction; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/SimpleEqualsPlugin.java similarity index 90% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/SimpleEqualsPlugin.java index 954136ff..8608cd6f 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpleequals/SimpleEqualsPlugin.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb3_commons.plugin.simpleequals; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.codegenerator.AbstractCodeGeneratorPlugin; -import org.jvnet.jaxb2_commons.plugin.codegenerator.CodeGenerator; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.FieldUtils; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.util.FieldUtils; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.codegenerator.AbstractCodeGeneratorPlugin; +import org.jvnet.jaxb3_commons.plugin.codegenerator.CodeGenerator; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; @@ -41,7 +41,7 @@ public String getUsage() { @Override protected QName getSpecialIgnoredElementName() { - return org.jvnet.jaxb2_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME; + return org.jvnet.jaxb3_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME; } @Override diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeArguments.java similarity index 96% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeArguments.java index 44f868e6..daeacef6 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeArguments.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb3_commons.plugin.simplehashcode; import java.util.Collection; import java.util.ListIterator; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.codegenerator.Arguments; +import org.jvnet.jaxb3_commons.plugin.codegenerator.Arguments; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java similarity index 96% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java index 572be117..f20adef3 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb3_commons.plugin.simplehashcode; import java.util.Arrays; -import org.jvnet.jaxb2_commons.plugin.codegenerator.AbstractCodeGenerationImplementor; +import org.jvnet.jaxb3_commons.plugin.codegenerator.AbstractCodeGenerationImplementor; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeCodeGenerator.java similarity index 74% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeCodeGenerator.java index e62a6c2a..1673f5c6 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/HashCodeCodeGenerator.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb3_commons.plugin.simplehashcode; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.codegenerator.CodeGenerationAbstraction; +import org.jvnet.jaxb3_commons.plugin.codegenerator.CodeGenerationAbstraction; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/SimpleHashCodePlugin.java similarity index 88% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/SimpleHashCodePlugin.java index 127ab61e..3f8ef0f4 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplehashcode/SimpleHashCodePlugin.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb3_commons.plugin.simplehashcode; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.codegenerator.AbstractCodeGeneratorPlugin; -import org.jvnet.jaxb2_commons.plugin.codegenerator.CodeGenerator; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.FieldUtils; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.util.FieldUtils; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.codegenerator.AbstractCodeGeneratorPlugin; +import org.jvnet.jaxb3_commons.plugin.codegenerator.CodeGenerator; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; @@ -40,7 +40,7 @@ public String getUsage() { @Override protected QName getSpecialIgnoredElementName() { - return org.jvnet.jaxb2_commons.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME; + return org.jvnet.jaxb3_commons.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME; } private int multiplier = 31; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpletostring/SimpleToStringPlugin.java similarity index 87% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpletostring/SimpleToStringPlugin.java index 7dd158f0..c9f98786 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simpletostring/SimpleToStringPlugin.java @@ -1,24 +1,24 @@ -package org.jvnet.jaxb2_commons.plugin.simpletostring; +package org.jvnet.jaxb3_commons.plugin.simpletostring; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; -import org.jvnet.jaxb2_commons.lang.ToString2; -import org.jvnet.jaxb2_commons.lang.ToStringStrategy2; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.ClassUtils; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.lang.ToString2; +import org.jvnet.jaxb3_commons.lang.ToStringStrategy2; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JBlock; @@ -74,7 +74,7 @@ public JExpression createToStringStrategy(JCodeModel codeModel) { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -89,7 +89,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplify/Customizations.java similarity index 81% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplify/Customizations.java index cae9e91c..8b92e61e 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplify/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.simplify; +package org.jvnet.jaxb3_commons.plugin.simplify; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/simplify"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/simplify"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplify/SimplifyPlugin.java similarity index 92% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplify/SimplifyPlugin.java index 208e0585..c98dbb2b 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/simplify/SimplifyPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify; +package org.jvnet.jaxb3_commons.plugin.simplify; import java.text.MessageFormat; import java.util.ArrayList; @@ -8,11 +8,11 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JJavaName; @@ -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 com.sun.xml.bind.v2.model.core.ID; +import org.glassfish.jaxb.core.v2.model.core.ID; public class SimplifyPlugin extends AbstractParameterizablePlugin { @@ -59,7 +59,7 @@ public String getUsage() { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -74,10 +74,10 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.AS_REFERENCE_PROPERTY_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.AS_REFERENCE_PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } @@ -127,8 +127,8 @@ private void postProcessElementPropertyInfo(final Model model, if (CustomizationUtils .containsPropertyCustomizationInPropertyOrClass( property, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME)) { + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME)) { simplifyElementPropertyInfoAsElementPropertyInfo(model, classInfo, property); } @@ -139,15 +139,15 @@ private void postProcessReferencePropertyInfo(final Model model, if (CustomizationUtils .containsPropertyCustomizationInPropertyOrClass( property, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME)) { + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME)) { simplifyReferencePropertyInfoAsElementPropertyInfo(model, classInfo, property); } else if (CustomizationUtils .containsPropertyCustomizationInPropertyOrClass( property, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.AS_REFERENCE_PROPERTY_ELEMENT_NAME)) { + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.simplify.Customizations.AS_REFERENCE_PROPERTY_ELEMENT_NAME)) { simplifyReferencePropertyInfoAsReferencePropertyInfo(model, classInfo, property); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/tostring/Customizations.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/tostring/Customizations.java index 007c7d4e..299e30ed 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/tostring/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.tostring; +package org.jvnet.jaxb3_commons.plugin.tostring; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/toString"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/toString"; public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, "ignored"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/tostring/ToStringPlugin.java similarity index 87% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/tostring/ToStringPlugin.java index 1d9ae783..513ac452 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/tostring/ToStringPlugin.java @@ -1,24 +1,24 @@ -package org.jvnet.jaxb2_commons.plugin.tostring; +package org.jvnet.jaxb3_commons.plugin.tostring; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; -import org.jvnet.jaxb2_commons.lang.ToString2; -import org.jvnet.jaxb2_commons.lang.ToStringStrategy2; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.Customizations; -import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.plugin.util.FieldOutlineUtils; -import org.jvnet.jaxb2_commons.plugin.util.StrategyClassUtils; -import org.jvnet.jaxb2_commons.util.ClassUtils; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.lang.ToString2; +import org.jvnet.jaxb3_commons.lang.ToStringStrategy2; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.ClassUtils; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.plugin.Customizations; +import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb3_commons.plugin.util.StrategyClassUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JBlock; @@ -73,7 +73,7 @@ public JExpression createToStringStrategy(JCodeModel codeModel) { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); @@ -88,7 +88,7 @@ public void setIgnoring(Ignoring ignoring) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, + .asList(org.jvnet.jaxb3_commons.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/ArrayUtils.java similarity index 92% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/ArrayUtils.java index d1f00231..33448b83 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb3_commons.plugin.util; import java.lang.reflect.Array; import java.util.LinkedList; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/FieldOutlineUtils.java similarity index 82% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/FieldOutlineUtils.java index b7b67ada..114cd576 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/FieldOutlineUtils.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb3_commons.plugin.util; -import org.jvnet.jaxb2_commons.plugin.Ignoring; +import org.jvnet.jaxb3_commons.plugin.Ignoring; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/Predicate.java similarity index 61% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/Predicate.java index 0c38cf47..9b3917a8 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/Predicate.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb3_commons.plugin.util; public interface Predicate { diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/StrategyClassUtils.java similarity index 96% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/StrategyClassUtils.java index 33040600..c4c8397c 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/util/StrategyClassUtils.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb3_commons.plugin.util; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.jvnet.jaxb2_commons.plugin.Ignoring; -import org.jvnet.jaxb2_commons.util.JClassUtils; +import org.jvnet.jaxb3_commons.util.JClassUtils; +import org.jvnet.jaxb3_commons.plugin.Ignoring; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/value_constructor/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/value_constructor/Customizations.java new file mode 100644 index 00000000..04120280 --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/value_constructor/Customizations.java @@ -0,0 +1,12 @@ +package org.jvnet.jaxb3_commons.plugin.value_constructor; + +import javax.xml.namespace.QName; + +public class Customizations { + + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/value-constructor"; + + public static QName IGNORED_ELEMENT_NAME = new QName(NAMESPACE_URI, + "ignored"); + +} diff --git a/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/value_constructor/ValueConstructorPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/value_constructor/ValueConstructorPlugin.java new file mode 100644 index 00000000..1ab7a92d --- /dev/null +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/value_constructor/ValueConstructorPlugin.java @@ -0,0 +1,153 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jvnet.jaxb3_commons.plugin.value_constructor; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import org.xml.sax.ErrorHandler; + +import com.sun.codemodel.JClass; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JExpr; +import com.sun.codemodel.JFieldVar; +import com.sun.codemodel.JInvocation; +import com.sun.codemodel.JMethod; +import com.sun.codemodel.JMod; +import com.sun.codemodel.JVar; +import com.sun.tools.xjc.Plugin; +import com.sun.tools.xjc.Options; +import com.sun.tools.xjc.outline.ClassOutline; +import com.sun.tools.xjc.outline.Outline; + +/** + * Generate two constructors for each generated class, one of which is a default constructor, + * the other takes an argument for each field in the class and initialises the field with the + * argument value. + * + * Without this plugin, XJC will not generate any explicit constructors. + * + * @author Kenny MacLeod + * $Id: XjcValueConstructorPlugin.java,v 1.7 2007-11-26 18:35:27 skaffman Exp $ + */ +public class ValueConstructorPlugin extends Plugin +{ + @Override + public String getOptionName() + { + return "Xvalue-constructor"; + } + + @Override + public String getUsage() + { + return " -Xvalue-constructor : enable generation of value constructors"; + } + + @Override + public boolean run(final Outline outline, final Options options, final ErrorHandler errorHandler) { + // For each defined class + for (final ClassOutline classOutline : outline.getClasses()) { + final JDefinedClass implClass = classOutline.implClass; + + // Create the default, no-arg constructor + @SuppressWarnings("unused") + final JMethod defaultConstructor = implClass.constructor(JMod.PUBLIC); + defaultConstructor.javadoc().add("Default no-arg constructor"); + defaultConstructor.body().invoke("super"); + + final Collection superClassInstanceFields = getInstanceFields(getSuperclassFields(implClass)); + final Collection thisClassInstanceFields = getInstanceFields(implClass.fields().values()); + + final boolean doGenerateValueConstructor = !superClassInstanceFields.isEmpty() || !thisClassInstanceFields.isEmpty(); + + // If the class or its (generated) superclass has fields, then generate a value constructor + if (doGenerateValueConstructor) { + + // Create the skeleton of the value constructor + final JMethod valueConstructor = implClass.constructor(JMod.PUBLIC); + valueConstructor.javadoc().add("Fully-initialising value constructor"); + + // If our superclass is also being generated, then we can assume it will also have + // its own value constructor, so we add an invocation of that constructor. + if (implClass._extends() instanceof JDefinedClass) { + + final JInvocation superInvocation = valueConstructor.body().invoke("super"); + + // Add each argument to the super constructor. + for (JFieldVar superClassField : superClassInstanceFields) { + if (generateConstructorParameter(superClassField)) { + final JVar arg = valueConstructor.param(JMod.FINAL, superClassField.type(), superClassField.name()); + superInvocation.arg(arg); + } + } + } + + // Now add constructor parameters for each field in "this" class, and assign them to + // our fields. + for (final JFieldVar field : thisClassInstanceFields) { + if (generateConstructorParameter(field)) { + final JVar arg = valueConstructor.param(JMod.FINAL, field.type(), field.name()); + valueConstructor.body().assign(JExpr.refthis(field.name()), arg); + } + } + } + } + + return true; + } + + /** + * Takes a collection of fields, and returns a new collection containing only the instance + * (i.e. non-static) fields. + */ + protected Collection getInstanceFields(final Collection fields) { + final List instanceFields = new ArrayList(); + for (final JFieldVar fieldVar : fields) { + final boolean isStaticField = (fieldVar.mods().getValue() & JMod.STATIC) != 0; + if (!isStaticField) { + instanceFields.add(fieldVar); + } + } + return instanceFields; + } + + /** + * Whether or not to generate a constructor parameter for the given field. + */ + protected boolean generateConstructorParameter(final JFieldVar field) { + final boolean isStaticField = (field.mods().getValue() & JMod.STATIC) > 0; + return !isStaticField; + } + + /** + * Retrieve a List of the fields of each ancestor class. I walk up the class hierarchy + * until I reach a class that isn't being generated by JAXB. + */ + protected List getSuperclassFields(final JDefinedClass implClass) { + final List fieldList = new LinkedList(); + + JClass superclass = implClass._extends(); + while (superclass instanceof JDefinedClass) { + fieldList.addAll(0, ((JDefinedClass)superclass).fields().values()); + superclass = superclass._extends(); + } + + return fieldList; + } +} \ No newline at end of file diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/wildcard/Customizations.java similarity index 74% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/wildcard/Customizations.java index ea32d362..55a6c089 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/wildcard/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.wildcard; +package org.jvnet.jaxb3_commons.plugin.wildcard; import javax.xml.namespace.QName; public class Customizations { - public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic/wildcard"; + public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic/wildcard"; public static QName LAX_ELEMENT_NAME = new QName(NAMESPACE_URI, "lax"); public static QName STRICT_ELEMENT_NAME = new QName(NAMESPACE_URI, "strict"); diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/wildcard/WildcardPlugin.java similarity index 88% rename from basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java rename to basic/src/main/java/org/jvnet/jaxb3_commons/plugin/wildcard/WildcardPlugin.java index 33839b93..f23213a0 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java +++ b/basic/src/main/java/org/jvnet/jaxb3_commons/plugin/wildcard/WildcardPlugin.java @@ -1,19 +1,19 @@ -package org.jvnet.jaxb2_commons.plugin.wildcard; +package org.jvnet.jaxb3_commons.plugin.wildcard; import java.util.Arrays; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.util.CustomizationUtils; import org.xml.sax.ErrorHandler; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CPropertyInfo; import com.sun.tools.xjc.model.CReferencePropertyInfo; import com.sun.tools.xjc.model.Model; -import com.sun.xml.bind.v2.model.core.WildcardMode; +import org.glassfish.jaxb.core.v2.model.core.WildcardMode; public class WildcardPlugin extends AbstractParameterizablePlugin { @@ -89,9 +89,9 @@ public void postProcessModel(Model model, ErrorHandler errorHandler) { @Override public Collection getCustomizationElementNames() { return Arrays - .asList(org.jvnet.jaxb2_commons.plugin.wildcard.Customizations.LAX_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.wildcard.Customizations.SKIP_ELEMENT_NAME, - org.jvnet.jaxb2_commons.plugin.wildcard.Customizations.STRICT_ELEMENT_NAME); + .asList(org.jvnet.jaxb3_commons.plugin.wildcard.Customizations.LAX_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.wildcard.Customizations.SKIP_ELEMENT_NAME, + org.jvnet.jaxb3_commons.plugin.wildcard.Customizations.STRICT_ELEMENT_NAME); } } diff --git a/basic/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin b/basic/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin index 9c97afad..c9535cb7 100644 --- a/basic/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin +++ b/basic/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin @@ -1,17 +1,22 @@ -org.jvnet.jaxb2_commons.plugin.jaxbindex.JaxbIndexPlugin -org.jvnet.jaxb2_commons.plugin.tostring.ToStringPlugin -org.jvnet.jaxb2_commons.plugin.equals.EqualsPlugin -org.jvnet.jaxb2_commons.plugin.hashcode.HashCodePlugin -org.jvnet.jaxb2_commons.plugin.copyable.CopyablePlugin -org.jvnet.jaxb2_commons.plugin.mergeable.MergeablePlugin -org.jvnet.jaxb2_commons.plugin.inheritance.InheritancePlugin -org.jvnet.jaxb2_commons.plugin.setters.SettersPlugin -org.jvnet.jaxb2_commons.plugin.wildcard.WildcardPlugin -org.jvnet.jaxb2_commons.plugin.autoinheritance.AutoInheritancePlugin -org.jvnet.jaxb2_commons.plugin.elementwrapper.ElementWrapperPlugin -org.jvnet.jaxb2_commons.plugin.simplify.SimplifyPlugin -org.jvnet.jaxb2_commons.plugin.simplehashcode.SimpleHashCodePlugin -org.jvnet.jaxb2_commons.plugin.simpleequals.SimpleEqualsPlugin -org.jvnet.jaxb2_commons.plugin.enumvalue.EnumValuePlugin -org.jvnet.jaxb2_commons.plugin.fixjaxb1058.FixJAXB1058Plugin -org.jvnet.jaxb2_commons.plugin.customizations.CustomizationsPlugin \ No newline at end of file +org.jvnet.jaxb3_commons.plugin.jaxbindex.JaxbIndexPlugin +org.jvnet.jaxb3_commons.plugin.tostring.ToStringPlugin +org.jvnet.jaxb3_commons.plugin.equals.EqualsPlugin +org.jvnet.jaxb3_commons.plugin.hashcode.HashCodePlugin +org.jvnet.jaxb3_commons.plugin.copyable.CopyablePlugin +org.jvnet.jaxb3_commons.plugin.mergeable.MergeablePlugin +org.jvnet.jaxb3_commons.plugin.inheritance.InheritancePlugin +org.jvnet.jaxb3_commons.plugin.setters.SettersPlugin +org.jvnet.jaxb3_commons.plugin.wildcard.WildcardPlugin +org.jvnet.jaxb3_commons.plugin.autoinheritance.AutoInheritancePlugin +org.jvnet.jaxb3_commons.plugin.elementwrapper.ElementWrapperPlugin +org.jvnet.jaxb3_commons.plugin.simplify.SimplifyPlugin +org.jvnet.jaxb3_commons.plugin.simplehashcode.SimpleHashCodePlugin +org.jvnet.jaxb3_commons.plugin.simpleequals.SimpleEqualsPlugin +org.jvnet.jaxb3_commons.plugin.enumvalue.EnumValuePlugin +org.jvnet.jaxb3_commons.plugin.fixjaxb1058.FixJAXB1058Plugin +org.jvnet.jaxb3_commons.plugin.customizations.CustomizationsPlugin +org.jvnet.jaxb3_commons.plugin.value_constructor.ValueConstructorPlugin +org.jvnet.jaxb3_commons.plugin.fluent_api.FluentApiPlugin +org.jvnet.jaxb3_commons.plugin.namespace_prefix.NamespacePrefixPlugin +org.jvnet.jaxb3_commons.plugin.defaultvalueplugin.DefaultValuePlugin +org.jvnet.jaxb3_commons.plugin.commons_lang.XjcCommonsLangPlugin \ No newline at end of file diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/copyable/tests/RunCopyablePlugin.java similarity index 61% rename from basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java rename to basic/src/test/java/org/jvnet/jaxb3_commons/plugin/copyable/tests/RunCopyablePlugin.java index c3ceb73b..6f676441 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java +++ b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/copyable/tests/RunCopyablePlugin.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.plugin.copyable.tests; +package org.jvnet.jaxb3_commons.plugin.copyable.tests; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; -public class RunCopyablePlugin extends RunXJC2Mojo { +public class RunCopyablePlugin extends RunXJC3Mojo { @Override public File getSchemaDirectory() { @@ -15,7 +15,7 @@ public File getSchemaDirectory() { } @Override - protected void configureMojo(AbstractXJC2Mojo mojo) { + protected void configureMojo(AbstractXJC3Mojo mojo) { super.configureMojo(mojo); mojo.setForceRegenerate(true); } diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/equals/tests/RunEqualsPlugin.java similarity index 61% rename from basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java rename to basic/src/test/java/org/jvnet/jaxb3_commons/plugin/equals/tests/RunEqualsPlugin.java index b29251cc..42ff52bf 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java +++ b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/equals/tests/RunEqualsPlugin.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.plugin.equals.tests; +package org.jvnet.jaxb3_commons.plugin.equals.tests; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; -public class RunEqualsPlugin extends RunXJC2Mojo { +public class RunEqualsPlugin extends RunXJC3Mojo { @Override public File getSchemaDirectory() { @@ -15,7 +15,7 @@ public File getSchemaDirectory() { } @Override - protected void configureMojo(AbstractXJC2Mojo mojo) { + protected void configureMojo(AbstractXJC3Mojo mojo) { super.configureMojo(mojo); mojo.setForceRegenerate(true); } diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/inheritance/tests/JavaParserTest.java similarity index 83% rename from basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java rename to basic/src/test/java/org/jvnet/jaxb3_commons/plugin/inheritance/tests/JavaParserTest.java index d1944b43..cdcdeef5 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java +++ b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/inheritance/tests/JavaParserTest.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.tests; +package org.jvnet.jaxb3_commons.plugin.inheritance.tests; import junit.framework.TestCase; -import org.jvnet.jaxb2_commons.plugin.inheritance.util.JavaTypeParser; +import org.jvnet.jaxb3_commons.plugin.inheritance.util.JavaTypeParser; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/inheritance/tests/JavaTypeParserTest.java similarity index 97% rename from basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java rename to basic/src/test/java/org/jvnet/jaxb3_commons/plugin/inheritance/tests/JavaTypeParserTest.java index 8566557b..4343a1d0 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java +++ b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/inheritance/tests/JavaTypeParserTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.tests; +package org.jvnet.jaxb3_commons.plugin.inheritance.tests; import japa.parser.JavaParser; import japa.parser.ast.CompilationUnit; diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/mergeable/tests/RunMergeablePlugin.java similarity index 61% rename from basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java rename to basic/src/test/java/org/jvnet/jaxb3_commons/plugin/mergeable/tests/RunMergeablePlugin.java index 8faa3469..2f4b5b63 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java +++ b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/mergeable/tests/RunMergeablePlugin.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.plugin.mergeable.tests; +package org.jvnet.jaxb3_commons.plugin.mergeable.tests; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; -public class RunMergeablePlugin extends RunXJC2Mojo { +public class RunMergeablePlugin extends RunXJC3Mojo { @Override public File getSchemaDirectory() { @@ -15,7 +15,7 @@ public File getSchemaDirectory() { } @Override - protected void configureMojo(AbstractXJC2Mojo mojo) { + protected void configureMojo(AbstractXJC3Mojo mojo) { super.configureMojo(mojo); mojo.setForceRegenerate(true); } diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/tostring/tests/RunToStringPlugin.java similarity index 61% rename from basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java rename to basic/src/test/java/org/jvnet/jaxb3_commons/plugin/tostring/tests/RunToStringPlugin.java index 1d435a9e..34d6d3e9 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java +++ b/basic/src/test/java/org/jvnet/jaxb3_commons/plugin/tostring/tests/RunToStringPlugin.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.plugin.tostring.tests; +package org.jvnet.jaxb3_commons.plugin.tostring.tests; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; -public class RunToStringPlugin extends RunXJC2Mojo { +public class RunToStringPlugin extends RunXJC3Mojo { @Override public File getSchemaDirectory() { @@ -16,7 +16,7 @@ public File getSchemaDirectory() { } @Override - protected void configureMojo(AbstractXJC2Mojo mojo) { + protected void configureMojo(AbstractXJC3Mojo mojo) { super.configureMojo(mojo); mojo.setForceRegenerate(true); } diff --git a/basic/src/test/resources/schema.xsd b/basic/src/test/resources/schema.xsd index 29a52962..b1653b3d 100644 --- a/basic/src/test/resources/schema.xsd +++ b/basic/src/test/resources/schema.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/dist/pom.xml b/dist/pom.xml index 07544060..b8627e00 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -2,66 +2,66 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-dist + org.jvnet.jaxb3_commons + jaxb3-basics-dist pom - JAXB2 Basics - Distribution + JAXB3 Basics - Distribution - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT ${project.groupId} - jaxb2-basics-plugins + jaxb3-basics-plugins ${project.version} ${project.groupId} - jaxb2-basics-sample-po + jaxb3-basics-sample-po zip maven-src ${project.version} ${project.groupId} - jaxb2-basics-sample-po + jaxb3-basics-sample-po zip ant-src ${project.version} ${project.groupId} - jaxb2-basics-sample-po-simple + jaxb3-basics-sample-po-simple zip maven-src ${project.version} ${project.groupId} - jaxb2-basics-sample-po-simple + jaxb3-basics-sample-po-simple zip ant-src ${project.version} ${project.groupId} - jaxb2-basics-sample-basic + jaxb3-basics-sample-basic zip maven-src ${project.version} ${project.groupId} - jaxb2-basics-sample-basic + jaxb3-basics-sample-basic zip ant-src ${project.version} ${project.groupId} - jaxb2-basics-sample-cxf + jaxb3-basics-sample-cxf zip maven-src ${project.version} diff --git a/plugins/pom.xml b/plugins/pom.xml index be9081e3..a4a81bda 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -1,29 +1,29 @@ 4.0.0 - jaxb2-basics-plugins + jaxb3-basics-plugins jar - JAXB2 Basics - Full Plugins JAR + JAXB3 Basics - Full Plugins JAR - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime - org.jvnet.jaxb2_commons - jaxb2-basics-tools + org.jvnet.jaxb3_commons + jaxb3-basics-tools com.sun.activation - javax.activation + jakarta.activation diff --git a/plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Dummy.java b/plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Dummy.java deleted file mode 100644 index 73722fa6..00000000 --- a/plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Dummy.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.jvnet.jaxb2_commons.plugin; - -public class Dummy {} diff --git a/plugins/src/main/java/org/jvnet/jaxb3_commons/plugin/Dummy.java b/plugins/src/main/java/org/jvnet/jaxb3_commons/plugin/Dummy.java new file mode 100644 index 00000000..ebad7ad9 --- /dev/null +++ b/plugins/src/main/java/org/jvnet/jaxb3_commons/plugin/Dummy.java @@ -0,0 +1,3 @@ +package org.jvnet.jaxb3_commons.plugin; + +public class Dummy {} diff --git a/pom.xml b/pom.xml index a6853fcf..ff9c11db 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb3_commons + jaxb3-basics-project pom - 2.3.6-SNAPSHOT - JAXB2 Basics - Project + 3.0.0-SNAPSHOT + JAXB3 Basics - Project https://github.com/highsource/jaxb2-basics - JAXB2 Basics is a part of JAXB2 Commons project which implements plugins and tools for JAXB 2.x reference implementation. + JAXB3 Basics is a part of JAXB3 Commons project which implements plugins and tools for JAXB 3.x reference implementation. GitHub Issues https://github.com/highsource/jaxb2-basics/issues @@ -170,13 +170,13 @@ UTF-8 - 2.3.6 - 2.3.1 - 2.3.0.1 - 1.2.0 - 0.15.1 - 1.6.8 - 3.3.13 + 3.0.2 + 3.0.1 + 3.0.2 + 2.0.1 + 4.0.0-SNAPSHOT + 1.6.8 + 4.0.0 1.7.36 @@ -203,50 +203,50 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-plugins + org.jvnet.jaxb3_commons + jaxb3-basics-plugins ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics-ant + org.jvnet.jaxb3_commons + jaxb3-basics-ant ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics-tools + org.jvnet.jaxb3_commons + jaxb3-basics-tools ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics ${project.version} - + - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb3-maven-plugin + ${maven-jaxb3-plugin.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb3-maven-plugin-testing + ${maven-jaxb3-plugin.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb-api.version} @@ -266,7 +266,7 @@ com.sun.activation - javax.activation + jakarta.activation ${activation.version} @@ -301,7 +301,7 @@ org.apache.commons commons-lang3 - 3.2.1 + 3.12.0 commons-io @@ -311,7 +311,7 @@ commons-beanutils commons-beanutils - 1.9.3 + 1.9.4 commons-logging @@ -399,67 +399,67 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 3.0.0 org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.4.1 org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.1 org.apache.maven.plugins maven-jar-plugin - 3.1.0 + 3.3.0 org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.2.0 org.apache.maven.plugins maven-install-plugin - 2.5.2 + 3.1.0 org.apache.maven.plugins maven-site-plugin - 3.7.1 + 3.12.1 org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.3.0 org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + 2.22.2 org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.5.0 org.apache.maven.plugins maven-assembly-plugin - 3.1.0 + 3.4.2 org.apache.felix maven-bundle-plugin - 3.5.0 + 3.5.1 org.apache.maven.plugins maven-invoker-plugin - 3.1.0 + 3.4.0 org.owasp @@ -469,17 +469,17 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + 3.4.1 org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb3-maven-plugin + ${maven-jaxb3-plugin.version} generate diff --git a/runtime/pom.xml b/runtime/pom.xml index bb75e068..e757f5d6 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - jaxb2-basics-runtime + jaxb3-basics-runtime jar - JAXB2 Basics - Runtime + JAXB3 Basics - Runtime - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided @@ -26,7 +26,7 @@ com.sun.activation - javax.activation + jakarta.activation provided diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java deleted file mode 100644 index ee52ac83..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; - -public interface MBuiltinLeafInfo extends MTypeInfo, - MOriginated { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java deleted file mode 100644 index 4a64e9c1..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin; - -public interface MClassRef extends - MClassTypeInfo { -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java deleted file mode 100644 index 3b994ecd..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -public interface MCustomization { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java deleted file mode 100644 index e9b3f17d..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; - -public interface MElement extends - MElementTypeInfo { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java deleted file mode 100644 index 5249f0cb..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; - -public interface MEnumConstantInfo extends - MOriginated { - - public String getLexicalValue(); -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java deleted file mode 100644 index 64602728..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -public interface MTransientPropertyInfo { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java deleted file mode 100644 index c83e3a70..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; - -public interface MWildcardTypeInfo extends MTypeInfo, - MOriginated { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java deleted file mode 100644 index f57e0113..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo; - -public interface BuiltinLeafInfoOrigin> extends MSourced{ - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java deleted file mode 100644 index 69f4aadd..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; - -public class CMAnyAttributePropertyInfoOrigin implements MPropertyInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java deleted file mode 100644 index 3d2ccc09..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPackageInfoOrigin; - -public class CMPackageInfoOrigin implements MPackageInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java deleted file mode 100644 index f6873a57..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.ClassInfo; - -public interface ClassInfoOrigin> extends - MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java deleted file mode 100644 index 9edc45f0..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.ElementInfo; - -public interface ElementInfoOrigin> extends - MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java deleted file mode 100644 index cf74df8e..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.Element; - -public interface ElementOrigin> extends MSourced{ - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java deleted file mode 100644 index 9a1e6713..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.EnumConstant; - -public interface EnumConstantOrigin> - extends MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java deleted file mode 100644 index bcd7c6b5..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.EnumLeafInfo; - -public interface EnumLeafInfoOrigin> extends - MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java deleted file mode 100644 index 3fc35cb6..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.PropertyInfo; - -public interface PropertyInfoOrigin> - extends MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java deleted file mode 100644 index e09a7991..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.TypeInfoSet; - -public interface TypeInfoSetOrigin> - extends MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java deleted file mode 100644 index bbf6ab9d..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.xml.bind.v2.model.core.WildcardTypeInfo; - -public interface WildcardTypeInfoOrigin> - extends MSourced { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java deleted file mode 100644 index 4bbf4f3e..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MBuiltinLeafInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java deleted file mode 100644 index 4ded9fef..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MClassRefOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java deleted file mode 100644 index 050042ba..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MElementInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java deleted file mode 100644 index c13f9875..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MEnumConstantInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java deleted file mode 100644 index 3df809c4..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MModelInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java deleted file mode 100644 index 1d43b29b..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MPackageInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java deleted file mode 100644 index f701d620..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MPropertyInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java deleted file mode 100644 index 175cd965..00000000 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; - -public interface MWildcardTypeInfoOrigin { - -} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/i18n/Reportable.java similarity index 95% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/i18n/Reportable.java index 20e638de..01c991d2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/i18n/Reportable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.i18n; +package org.jvnet.jaxb3_commons.i18n; import java.util.ResourceBundle; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ClassUtils.java similarity index 93% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ClassUtils.java index 809e10d3..7641e84e 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; public class ClassUtils { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ContextUtils.java similarity index 87% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ContextUtils.java index 2b44d8ac..70f46c62 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ContextUtils.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; public class ContextUtils { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyStrategy.java similarity index 92% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyStrategy.java index 13aca06c..f517ce5a 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface CopyStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyStrategy2.java similarity index 94% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyStrategy2.java index b0ebfb18..fa2d722f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface CopyStrategy2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyTo.java similarity index 69% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyTo.java index 9eeabe00..25e29c89 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyTo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface CopyTo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyTo2.java similarity index 68% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyTo2.java index de83c739..ca2851a1 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/CopyTo2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface CopyTo2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultCopyStrategy.java similarity index 94% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultCopyStrategy.java index 9b414df6..6897ab28 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultCopyStrategy.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultCopyStrategy implements CopyStrategy2, CopyStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultEqualsStrategy.java similarity index 95% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultEqualsStrategy.java index 8ecc6a7c..f5fe6c78 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultEqualsStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultEqualsStrategy implements EqualsStrategy2, EqualsStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultHashCodeStrategy.java similarity index 95% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultHashCodeStrategy.java index 8f96c575..a7076fbd 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultHashCodeStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultHashCodeStrategy implements HashCodeStrategy2, HashCodeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultMergeStrategy.java similarity index 95% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultMergeStrategy.java index 5fe820e8..7a06b0d6 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultMergeStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultMergeStrategy implements MergeStrategy2, MergeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultToStringStrategy.java similarity index 96% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultToStringStrategy.java index 695b6dae..1b4ca04c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/DefaultToStringStrategy.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.property; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.property; import java.util.Collection; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultToStringStrategy implements ToStringStrategy2, diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EnumValue.java similarity index 61% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EnumValue.java index c29553a6..482de14b 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EnumValue.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; public interface EnumValue { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Equals.java similarity index 64% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Equals.java index d0091b65..197b2928 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Equals.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface Equals { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Equals2.java similarity index 63% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Equals2.java index 54176267..465c2fda 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Equals2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface Equals2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EqualsStrategy.java similarity index 95% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EqualsStrategy.java index 53d78c5a..49e75577 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EqualsStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface EqualsStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EqualsStrategy2.java similarity index 96% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EqualsStrategy2.java index e5c0e61a..c5f2f093 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/EqualsStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface EqualsStrategy2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCode.java similarity index 57% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCode.java index 95890cc6..1c83ad79 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCode.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface HashCode { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCode2.java similarity index 55% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCode2.java index 1de23ad8..5271a52c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCode2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface HashCode2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCodeStrategy.java similarity index 93% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCodeStrategy.java index e1b42bf5..300c3948 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCodeStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface HashCodeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCodeStrategy2.java similarity index 94% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCodeStrategy2.java index 42359503..c771dfc5 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/HashCodeStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface HashCodeStrategy2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBCopyStrategy.java similarity index 86% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBCopyStrategy.java index 8ba3a2d5..f8d8f1b9 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBCopyStrategy.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.property; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.property; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; import org.w3c.dom.Node; public class JAXBCopyStrategy extends DefaultCopyStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBEqualsStrategy.java similarity index 85% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBEqualsStrategy.java index aef93991..e526e331 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBEqualsStrategy.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.property; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.property; import java.util.Iterator; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class JAXBEqualsStrategy extends DefaultEqualsStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBHashCodeStrategy.java similarity index 86% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBHashCodeStrategy.java index a982edf7..9e6c739c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBHashCodeStrategy.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.property; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb3_commons.locator.util.LocatorUtils.property; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class JAXBHashCodeStrategy extends DefaultHashCodeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBMergeCollectionsStrategy.java similarity index 90% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBMergeCollectionsStrategy.java index 6bd697da..b0cb0d1d 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBMergeCollectionsStrategy.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; import java.util.ArrayList; import java.util.Collection; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class JAXBMergeCollectionsStrategy extends JAXBMergeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBMergeStrategy.java similarity index 90% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBMergeStrategy.java index 565a2cd7..aad82f08 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBMergeStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; import java.util.Collection; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class JAXBMergeStrategy extends DefaultMergeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBToStringStrategy.java similarity index 89% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBToStringStrategy.java index ed21055d..29d17f8f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/JAXBToStringStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class JAXBToStringStrategy extends DefaultToStringStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeFrom.java similarity index 75% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeFrom.java index 21694372..f7d37f4b 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeFrom.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface MergeFrom { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeFrom2.java similarity index 74% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeFrom2.java index 8e959781..425a64d1 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeFrom2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface MergeFrom2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeStrategy.java similarity index 95% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeStrategy.java index c365bf63..89bf6617 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface MergeStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeStrategy2.java similarity index 96% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeStrategy2.java index 2b1b1e78..184a93b2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/MergeStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface MergeStrategy2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/StringUtils.java similarity index 94% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/StringUtils.java index 942f4785..3f6aa154 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/StringUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; import java.util.ArrayList; import java.util.Iterator; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToString.java similarity index 76% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToString.java index 68977f6d..fb695cb6 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToString.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface ToString { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToString2.java similarity index 75% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToString2.java index 83064879..52db9254 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToString2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface ToString2 { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToStringStrategy.java similarity index 98% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToStringStrategy.java index b7ab9afb..602bca36 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToStringStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; @Deprecated public interface ToStringStrategy { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToStringStrategy2.java similarity index 98% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToStringStrategy2.java index 1a992868..5104ce5a 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/ToStringStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public interface ToStringStrategy2 { /* diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Validate.java similarity index 92% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Validate.java index 308b9586..02ef0ae7 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/lang/Validate.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; import java.util.Collection; import java.util.Iterator; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/AbstractObjectLocator.java similarity index 98% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/AbstractObjectLocator.java index 40a1434c..d4c38090 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/AbstractObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; import java.net.URL; import java.text.MessageFormat; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultItemObjectLocator.java similarity index 96% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultItemObjectLocator.java index 6e192af1..e8bce5eb 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultItemObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; import java.text.MessageFormat; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultPropertyObjectLocator.java similarity index 96% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultPropertyObjectLocator.java index 8b9da0de..1e6e7c00 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultPropertyObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; import java.text.MessageFormat; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultRootObjectLocator.java similarity index 92% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultRootObjectLocator.java index 201dcd30..70d137de 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/DefaultRootObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; import java.text.MessageFormat; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/ItemObjectLocator.java similarity index 86% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/ItemObjectLocator.java index 43003127..30e26470 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/ItemObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; /** * Models item locator. diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/ObjectLocator.java similarity index 89% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/ObjectLocator.java index 767d01cf..1fa0bf2e 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/ObjectLocator.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.ValidationEventLocator; -import org.jvnet.jaxb2_commons.i18n.Reportable; +import org.jvnet.jaxb3_commons.i18n.Reportable; /** * Object locator denotes a location in an object structure. diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/PropertyObjectLocator.java similarity index 88% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/PropertyObjectLocator.java index c394ea88..ac4335b4 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/PropertyObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; /** * Models a property locator. diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/RootObjectLocator.java similarity index 60% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/RootObjectLocator.java index 72f23926..ea387ca2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/RootObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb3_commons.locator; public interface RootObjectLocator extends ObjectLocator { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/util/LocatorUtils.java similarity index 94% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/locator/util/LocatorUtils.java index e8756384..61286662 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/locator/util/LocatorUtils.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.locator.util; +package org.jvnet.jaxb3_commons.locator.util; -import org.jvnet.jaxb2_commons.locator.PropertyObjectLocator; -import org.jvnet.jaxb2_commons.locator.ItemObjectLocator; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.PropertyObjectLocator; +import org.jvnet.jaxb3_commons.locator.ItemObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; import org.xml.sax.Locator; public class LocatorUtils { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/AfterMarshallCallback.java similarity index 55% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/AfterMarshallCallback.java index c5396bd4..d444d036 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/AfterMarshallCallback.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb3_commons.xml.bind; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Marshaller; public interface AfterMarshallCallback { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/AfterUnmarshallCallback.java similarity index 59% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/AfterUnmarshallCallback.java index 31cbca29..50733ab5 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/AfterUnmarshallCallback.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb3_commons.xml.bind; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Unmarshaller; public interface AfterUnmarshallCallback { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/BeforeMarshallCallback.java similarity index 55% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/BeforeMarshallCallback.java index b3187ec4..28cf20b8 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/BeforeMarshallCallback.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb3_commons.xml.bind; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Marshaller; public interface BeforeMarshallCallback { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/BeforeUnmarshallCallback.java similarity index 60% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/BeforeUnmarshallCallback.java index ec15fe1d..4826876d 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/BeforeUnmarshallCallback.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb3_commons.xml.bind; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Unmarshaller; public interface BeforeUnmarshallCallback { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/ContextPathAware.java similarity index 88% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/ContextPathAware.java index 147dcfea..aabd8b0d 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/ContextPathAware.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb3_commons.xml.bind; /** diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java similarity index 81% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java index 09ad0568..4c5c18db 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.annotation.adapters; +package org.jvnet.jaxb3_commons.xml.bind.annotation.adapters; import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; -import org.jvnet.jaxb2_commons.lang.StringUtils; +import org.jvnet.jaxb3_commons.lang.StringUtils; public class CommaDelimitedStringAdapter extends XmlAdapter> { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAnyAttributePropertyInfo.java similarity index 65% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAnyAttributePropertyInfo.java index cd8fbec0..a7ca325c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAnyAttributePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MAnyAttributePropertyInfo extends MPropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAnyElementPropertyInfo.java similarity index 70% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAnyElementPropertyInfo.java index b8fc4ddf..cec5b0d3 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAnyElementPropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MAnyElementPropertyInfo extends MPropertyInfo, MWildcard, MMixable { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAttributePropertyInfo.java similarity index 78% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAttributePropertyInfo.java index 60fb38ec..003442ac 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MAttributePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import javax.xml.namespace.QName; diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MBuiltinLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MBuiltinLeafInfo.java new file mode 100644 index 00000000..16b78097 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MBuiltinLeafInfo.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; + +public interface MBuiltinLeafInfo extends MTypeInfo, + MOriginated { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassInfo.java similarity index 83% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassInfo.java index de99ef1d..fb4bbb53 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassInfo.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import java.util.List; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassInfoOrigin; public interface MClassInfo extends MClassTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassRef.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassRef.java new file mode 100644 index 00000000..8fa00d55 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassRef.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassRefOrigin; + +public interface MClassRef extends + MClassTypeInfo { +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassTypeInfo.java similarity index 69% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassTypeInfo.java index 2dd3365e..caaf2ea2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassTypeInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; public interface MClassTypeInfo extends MPackagedTypeInfo, MTypeInfo, MOriginated, MContainer { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassTypeInfoVisitor.java similarity index 77% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassTypeInfoVisitor.java index 20e3ce9f..926f397b 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MClassTypeInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MClassTypeInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MContained.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MContained.java index 02434f15..37336bd9 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MContained.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MContained { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MContainer.java similarity index 74% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MContainer.java index b5a4d00d..0849245f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MContainer.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MContainer extends MPackaged { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomizable.java similarity index 63% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomizable.java index 8bcd6d91..67ad8ac7 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomizable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MCustomizable { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomization.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomization.java new file mode 100644 index 00000000..9328938d --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomization.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +public interface MCustomization { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomizations.java similarity index 78% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomizations.java index c27fc837..8c91736c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MCustomizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import java.util.List; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MDefaultValue.java similarity index 78% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MDefaultValue.java index 624a643a..4cbfdef5 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MDefaultValue.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import javax.xml.namespace.NamespaceContext; diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElement.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElement.java new file mode 100644 index 00000000..08c4dfac --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElement.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementOrigin; + +public interface MElement extends + MElementTypeInfo { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementInfo.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementInfo.java index f73a31ff..6a59ff40 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementInfo.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; public interface MElementInfo extends MElementTypeInfo, MPackaged, MContained, diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementPropertyInfo.java similarity index 58% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementPropertyInfo.java index d33e5177..dbb275b0 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public interface MElementPropertyInfo extends MPropertyInfo, MWrappable, MElementTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementRefPropertyInfo.java similarity index 61% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementRefPropertyInfo.java index 351c70f7..e80a6a2c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementRefPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public interface MElementRefPropertyInfo extends MPropertyInfo, MMixable, MWrappable, MWildcard, MElementTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementRefsPropertyInfo.java similarity index 63% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementRefsPropertyInfo.java index 08c751e4..7466ebd4 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementRefsPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementOrigin; public interface MElementRefsPropertyInfo extends MPropertyInfo, MMixable, MWrappable, MWildcard, diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeInfo.java similarity index 63% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeInfo.java index 68b8efc6..8e1d3f75 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeInfo.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; public interface MElementTypeInfo extends MTyped, MNillable, MDefaultValue, MOriginated { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeInfos.java similarity index 76% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeInfos.java index be6a7def..b9808a7a 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeInfos.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import java.util.List; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeRef.java similarity index 52% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeRef.java index ea21a9df..95f097f2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementTypeRef.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementTypeRefOrigin; public interface MElementTypeRef extends MElementTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementsPropertyInfo.java similarity index 62% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementsPropertyInfo.java index 63d3e0c1..823c9092 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MElementsPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementTypeRefOrigin; public interface MElementsPropertyInfo extends MPropertyInfo, MWrappable, diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MEnumConstantInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MEnumConstantInfo.java new file mode 100644 index 00000000..72063b3e --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MEnumConstantInfo.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; + +public interface MEnumConstantInfo extends + MOriginated { + + public String getLexicalValue(); +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MEnumLeafInfo.java similarity index 78% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MEnumLeafInfo.java index 4386bd44..cd947921 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MEnumLeafInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import java.util.List; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; public interface MEnumLeafInfo extends MPackagedTypeInfo, MTypeInfo, MOriginated { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MID.java similarity index 70% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MID.java index 8bee7828..56a7a302 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MID.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MID extends MTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MIDREF.java similarity index 70% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MIDREF.java index 49d3578b..603da278 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MIDREF.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MIDREF extends MTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MIDREFS.java similarity index 58% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MIDREFS.java index c3bce439..b4dcfdc3 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MIDREFS.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MIDREFS extends MList { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MList.java similarity index 70% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MList.java index fff02943..896170f9 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MList.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MList extends MTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MMixable.java similarity index 55% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MMixable.java index f92d7417..09779f8d 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MMixable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MMixable { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MModelInfo.java similarity index 86% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MModelInfo.java index e8f4436b..d2235701 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MModelInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import java.util.Collection; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; public interface MModelInfo extends MCustomizable, MOriginated { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MNillable.java similarity index 56% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MNillable.java index 7af37409..85a6560a 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MNillable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MNillable { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackageInfo.java similarity index 51% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackageInfo.java index 8b8613fa..23b09d1f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackageInfo.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPackageInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPackageInfoOrigin; public interface MPackageInfo extends MOriginated, MContainer { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackaged.java similarity index 60% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackaged.java index afb4343f..82f5b042 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackaged.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MPackaged { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackagedTypeInfo.java similarity index 77% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackagedTypeInfo.java index c260a2d6..6ac93378 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackagedTypeInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MPackagedTypeInfo extends MTypeInfo, MPackaged, MContained { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackagedTypeInfoVisitor.java similarity index 94% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackagedTypeInfoVisitor.java index ed6a093e..481f2fee 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPackagedTypeInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public abstract class MPackagedTypeInfoVisitor implements MTypeInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPropertyInfo.java similarity index 67% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPropertyInfo.java index bbf7b1b4..e1973c8d 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPropertyInfo.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public interface MPropertyInfo extends MOriginated { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPropertyInfoVisitor.java similarity index 93% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPropertyInfoVisitor.java index 0e17d7a2..095ef17f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MPropertyInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MPropertyInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MSingleTypePropertyInfo.java similarity index 71% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MSingleTypePropertyInfo.java index 0030e013..afaaa6f6 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MSingleTypePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MSingleTypePropertyInfo extends MPropertyInfo, MTyped, MDefaultValue { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MSourced.java similarity index 54% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MSourced.java index 02da1bed..efb21a4b 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MSourced.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MSourced { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTargeted.java similarity index 55% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTargeted.java index a469ee11..dbbc2a12 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTargeted.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MTargeted { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTransientPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTransientPropertyInfo.java new file mode 100644 index 00000000..198e0eec --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTransientPropertyInfo.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +public interface MTransientPropertyInfo { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTypeInfo.java similarity index 81% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTypeInfo.java index 60d24b72..28d2578a 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTypeInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import javax.xml.namespace.QName; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTypeInfoVisitor.java similarity index 90% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTypeInfoVisitor.java index d2238e54..8684c2f8 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTypeInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MTypeInfoVisitor extends MClassTypeInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTyped.java similarity index 63% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTyped.java index abe30bad..2eb37149 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MTyped.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MTyped { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MValuePropertyInfo.java similarity index 66% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MValuePropertyInfo.java index a2e74086..42bde574 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MValuePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MValuePropertyInfo extends MSingleTypePropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWildcard.java similarity index 69% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWildcard.java index ebb5d6ab..f5fe37d0 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWildcard.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; public interface MWildcard { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWildcardTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWildcardTypeInfo.java new file mode 100644 index 00000000..2d165ce8 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWildcardTypeInfo.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb3_commons.xml.bind.model; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; + +public interface MWildcardTypeInfo extends MTypeInfo, + MOriginated { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWrappable.java similarity index 69% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWrappable.java index 1e465869..0b2d4d7f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/MWrappable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb3_commons.xml.bind.model; import javax.xml.namespace.QName; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java similarity index 60% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java index 3cbb55d2..5fc1b42b 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMAnyAttributePropertyInfo extends CMPropertyInfo implements MAnyAttributePropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java similarity index 75% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java index e1e3ceb7..75d1616a 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMAnyElementPropertyInfo extends CMPropertyInfo implements MAnyElementPropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java similarity index 69% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java index d88ad606..d04df636 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMAttributePropertyInfo extends CMSingleTypePropertyInfo implements MAttributePropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java similarity index 75% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java index 8ce0ec7d..0f260d85 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MBuiltinLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; public class CMBuiltinLeafInfo implements MBuiltinLeafInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMClassInfo.java similarity index 82% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMClassInfo.java index f8b481fc..b417f646 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMClassInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collections; @@ -8,22 +8,22 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MContainer; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.ClassInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.PropertyInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin; - -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.model.core.PropertyInfo; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MContainer; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.ClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.PropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassInfoOrigin; + +import org.glassfish.jaxb.core.v2.model.core.ClassInfo; +import org.glassfish.jaxb.core.v2.model.core.PropertyInfo; public class CMClassInfo implements MClassInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMClassRef.java similarity index 80% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMClassRef.java index ea6e7680..9e64788e 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMClassRef.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MContainer; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.util.XmlTypeUtils; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MContainer; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.util.XmlTypeUtils; public class CMClassRef implements MClassRef { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMCustomization.java similarity index 67% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMCustomization.java index bdab79c4..18b87063 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMCustomization.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomization; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomization; import org.w3c.dom.Element; public class CMCustomization implements MCustomization { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMCustomizations.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMCustomizations.java index fede50a1..fc45e4db 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMCustomizations.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomization; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomization; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; public class CMCustomizations implements MCustomizations { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElement.java similarity index 71% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElement.java index 9974ddf3..1148271f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElement.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.MElement; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MElement; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementOrigin; public class CMElement extends CMElementTypeInfo implements MElement { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementInfo.java similarity index 85% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementInfo.java index 4ca699c4..215cdf43 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementInfo.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.text.MessageFormat; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MContainer; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MContainer; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; public class CMElementInfo implements MElementInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementPropertyInfo.java similarity index 82% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementPropertyInfo.java index 0154d15b..2d5db6d5 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementPropertyInfo.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementPropertyInfo extends CMPropertyInfo implements MElementPropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java similarity index 85% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java index c70897a3..9f5d8114 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementRefPropertyInfo extends CMPropertyInfo implements MElementRefPropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java similarity index 79% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java index 41df090f..37be0810 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collection; @@ -7,12 +7,12 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElement; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElement; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementRefsPropertyInfo extends CMPropertyInfo implements MElementRefsPropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementTypeInfo.java similarity index 85% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementTypeInfo.java index 437045ba..bf7edf28 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementTypeInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; public abstract class CMElementTypeInfo implements MElementTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementTypeRef.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementTypeRef.java index ffc51451..b591e9a3 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementTypeRef.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementTypeRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementTypeRefOrigin; public class CMElementTypeRef extends CMElementTypeInfo implements diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java similarity index 75% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java index 93b7bf9e..6769c871 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collection; @@ -7,12 +7,12 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementTypeRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementsPropertyInfo extends CMPropertyInfo implements MElementsPropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMEnumConstantInfo.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMEnumConstantInfo.java index cda19b65..49946a69 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMEnumConstantInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; public class CMEnumConstantInfo implements MEnumConstantInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMEnumLeafInfo.java similarity index 80% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMEnumLeafInfo.java index 9eb7d4c2..c3bb837c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMEnumLeafInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.text.MessageFormat; import java.util.ArrayList; @@ -8,23 +8,23 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MContainer; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizable; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.EnumConstantOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.EnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; - -import com.sun.xml.bind.v2.model.core.EnumConstant; -import com.sun.xml.bind.v2.model.core.EnumLeafInfo; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MContainer; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizable; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.EnumConstantOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.EnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; + +import org.glassfish.jaxb.core.v2.model.core.EnumConstant; +import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; public class CMEnumLeafInfo implements MEnumLeafInfo, MCustomizable { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMID.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMID.java index ef45a3bf..9ec51cee 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMID.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.text.MessageFormat; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MID; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xmlschema.XmlSchemaConstants; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MID; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xmlschema.XmlSchemaConstants; public class CMID implements MID { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMIDREF.java similarity index 72% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMIDREF.java index 1c445a6a..7406f3cf 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMIDREF.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.text.MessageFormat; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MIDREF; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xmlschema.XmlSchemaConstants; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MIDREF; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xmlschema.XmlSchemaConstants; public class CMIDREF implements MIDREF { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMIDREFS.java similarity index 61% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMIDREFS.java index 664f4f8b..ad4bb870 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMIDREFS.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.text.MessageFormat; -import org.jvnet.jaxb2_commons.xml.bind.model.MIDREFS; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xmlschema.XmlSchemaConstants; +import org.jvnet.jaxb3_commons.xml.bind.model.MIDREFS; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xmlschema.XmlSchemaConstants; public class CMIDREFS extends CMList implements MIDREFS { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMInfoFactory.java similarity index 85% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMInfoFactory.java index ee68cfa0..edcc80aa 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMInfoFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collection; @@ -7,63 +7,63 @@ import java.util.Map; import java.util.Set; -import javax.activation.MimeType; +import jakarta.activation.MimeType; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MBuiltinLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MContainer; -import org.jvnet.jaxb2_commons.xml.bind.model.MElement; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementTypeRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMAnyAttributePropertyInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMBuiltinLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMClassInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementTypeRefOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMEnumConstantInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMEnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMModelInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMPropertyInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMWildcardTypeInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; - -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; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MContainer; +import org.jvnet.jaxb3_commons.xml.bind.model.MElement; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMAnyAttributePropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMBuiltinLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMElementInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMElementOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMModelInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMWildcardTypeInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_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; @SuppressWarnings("unchecked") public abstract class CMInfoFactory, diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMList.java similarity index 76% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMList.java index 0c368c05..4c8c7fc1 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMList.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.text.MessageFormat; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MList; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MList; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; public class CMList implements MList { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMModel.java similarity index 89% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMModel.java index bc3b033e..1cc382a6 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMModel.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collection; @@ -9,24 +9,24 @@ import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MBuiltinLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.ClassInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.ElementInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.EnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.TypeInfoSetOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin; - -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; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.ClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.ElementInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.EnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.TypeInfoSetOrigin; +import org.jvnet.jaxb3_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; public class CMModel implements MModelInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMPackageInfo.java similarity index 74% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMPackageInfo.java index e500dace..5fd6c200 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMPackageInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.lang.StringUtils; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPackageInfoOrigin; +import org.jvnet.jaxb3_commons.lang.StringUtils; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPackageInfoOrigin; public class CMPackageInfo implements MPackageInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMPropertyInfo.java similarity index 74% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMPropertyInfo.java index 1d4a29c0..ee89c805 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMPropertyInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizable; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizable; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public abstract class CMPropertyInfo implements MPropertyInfo, MCustomizable { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java similarity index 75% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java index 7ed63bc7..54ed4674 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MSingleTypePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MSingleTypePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public abstract class CMSingleTypePropertyInfo extends CMPropertyInfo implements MSingleTypePropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMValuePropertyInfo.java similarity index 64% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMValuePropertyInfo.java index 838d7143..5b2532d0 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMValuePropertyInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.NamespaceContext; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MValuePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MValuePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; public class CMValuePropertyInfo extends CMSingleTypePropertyInfo implements MValuePropertyInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java similarity index 71% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java index cf797e0b..7a5669a9 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomizations; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MWildcardTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MCustomizations; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MWildcardTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; public class CMWildcardTypeInfo implements MWildcardTypeInfo { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java new file mode 100644 index 00000000..2aec07ae --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo; + +public interface BuiltinLeafInfoOrigin> extends MSourced{ + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java new file mode 100644 index 00000000..ea2031c8 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; + +public class CMAnyAttributePropertyInfoOrigin implements MPropertyInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java similarity index 59% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java index d700c3a4..9427a9d3 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; -import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo; +import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo; public class CMBuiltinLeafInfoOrigin> implements MBuiltinLeafInfoOrigin, BuiltinLeafInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java similarity index 58% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java index 602b996e..4fbca86f 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; -import com.sun.xml.bind.v2.model.core.ClassInfo; +import org.glassfish.jaxb.core.v2.model.core.ClassInfo; public class CMClassElementInfoOrigin> implements MElementInfoOrigin, ClassInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java similarity index 59% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java index d200488c..9363a27c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; -import com.sun.xml.bind.v2.model.core.ClassInfo; +import org.glassfish.jaxb.core.v2.model.core.ClassInfo; public class CMClassInfoOrigin> implements MClassInfoOrigin, ClassInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java similarity index 57% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java index 8ff9fa90..a0648cf7 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; -import com.sun.xml.bind.v2.model.core.ElementInfo; +import org.glassfish.jaxb.core.v2.model.core.ElementInfo; public class CMElementInfoOrigin> implements MElementInfoOrigin, ElementInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementOrigin.java similarity index 55% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementOrigin.java index 966adc73..b2abf09d 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementOrigin; -import com.sun.xml.bind.v2.model.core.Element; +import org.glassfish.jaxb.core.v2.model.core.Element; public class CMElementOrigin> implements MElementOrigin, ElementOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java similarity index 61% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java index f9782987..3665bd54 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementTypeRefOrigin; -import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; -import com.sun.xml.bind.v2.model.core.TypeRef; +import org.glassfish.jaxb.core.v2.model.core.ElementPropertyInfo; +import org.glassfish.jaxb.core.v2.model.core.TypeRef; public class CMElementTypeRefOrigin, TR extends TypeRef> implements MElementTypeRefOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java similarity index 59% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java index cb08cf96..00507b03 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; -import com.sun.xml.bind.v2.model.core.EnumConstant; +import org.glassfish.jaxb.core.v2.model.core.EnumConstant; public class CMEnumConstantInfoOrigin> implements MEnumConstantInfoOrigin, EnumConstantOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java similarity index 58% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java index 21db89a1..c7d3f45c 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; -import com.sun.xml.bind.v2.model.core.EnumLeafInfo; +import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; public class CMEnumElementInfoOrigin> implements MElementInfoOrigin, EnumLeafInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java similarity index 60% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java index 214552e3..7cf50dd8 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; -import com.sun.xml.bind.v2.model.core.EnumLeafInfo; +import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; public class CMEnumLeafInfoOrigin> implements MEnumLeafInfoOrigin, EnumLeafInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java similarity index 57% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java index 315bd67f..36d7ca48 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MModelInfoOrigin; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; +import org.glassfish.jaxb.core.v2.model.core.TypeInfoSet; public class CMModelInfoOrigin> implements MModelInfoOrigin, TypeInfoSetOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java new file mode 100644 index 00000000..5cca6ac3 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPackageInfoOrigin; + +public class CMPackageInfoOrigin implements MPackageInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java similarity index 58% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java index c6759068..43339b32 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; -import com.sun.xml.bind.v2.model.core.PropertyInfo; +import org.glassfish.jaxb.core.v2.model.core.PropertyInfo; public class CMPropertyInfoOrigin> implements MPropertyInfoOrigin, PropertyInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java similarity index 59% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java index bcb2c148..8bd1dbd4 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; -import com.sun.xml.bind.v2.model.core.WildcardTypeInfo; +import org.glassfish.jaxb.core.v2.model.core.WildcardTypeInfo; public class CMWildcardTypeInfoOrigin> implements MWildcardTypeInfoOrigin, WildcardTypeInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java new file mode 100644 index 00000000..30080b78 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.ClassInfo; + +public interface ClassInfoOrigin> extends + MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java new file mode 100644 index 00000000..26e81f1f --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.ElementInfo; + +public interface ElementInfoOrigin> extends + MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ElementOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ElementOrigin.java new file mode 100644 index 00000000..474be9f9 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/ElementOrigin.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.Element; + +public interface ElementOrigin> extends MSourced{ + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java new file mode 100644 index 00000000..d3640e2e --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.EnumConstant; + +public interface EnumConstantOrigin> + extends MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java new file mode 100644 index 00000000..db4eada2 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; + +public interface EnumLeafInfoOrigin> extends + MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java new file mode 100644 index 00000000..3f266e61 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.PropertyInfo; + +public interface PropertyInfoOrigin> + extends MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java new file mode 100644 index 00000000..91b87e3f --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.TypeInfoSet; + +public interface TypeInfoSetOrigin> + extends MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java new file mode 100644 index 00000000..eaf5ed9f --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import org.glassfish.jaxb.core.v2.model.core.WildcardTypeInfo; + +public interface WildcardTypeInfoOrigin> + extends MSourced { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java new file mode 100644 index 00000000..d7a99055 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MBuiltinLeafInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MClassInfoOrigin.java similarity index 63% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MClassInfoOrigin.java index 895b4224..3e25de23 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MClassInfoOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.origin; public interface MClassInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MClassRefOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MClassRefOrigin.java new file mode 100644 index 00000000..3364bc3d --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MClassRefOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MClassRefOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementInfoOrigin.java new file mode 100644 index 00000000..202608f7 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MElementInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementOrigin.java similarity index 54% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementOrigin.java index acc2076c..fad0f70e 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.origin; public interface MElementOrigin extends MElementInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementTypeRefOrigin.java similarity index 56% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementTypeRefOrigin.java index 2b4f3301..24d388cb 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MElementTypeRefOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.origin; public interface MElementTypeRefOrigin extends MElementInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java new file mode 100644 index 00000000..355160cd --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MEnumConstantInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java similarity index 64% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java index 05c542f6..81a25251 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.origin; public interface MEnumLeafInfoOrigin { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MModelInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MModelInfoOrigin.java new file mode 100644 index 00000000..d23adaea --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MModelInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MModelInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MOriginated.java similarity index 53% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MOriginated.java index 48971d15..fa80251e 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MOriginated.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb3_commons.xml.bind.model.origin; public interface MOriginated { diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MPackageInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MPackageInfoOrigin.java new file mode 100644 index 00000000..09a1e4c0 --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MPackageInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MPackageInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MPropertyInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MPropertyInfoOrigin.java new file mode 100644 index 00000000..096ded5d --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MPropertyInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MPropertyInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java new file mode 100644 index 00000000..ae68233d --- /dev/null +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.origin; + +public interface MWildcardTypeInfoOrigin { + +} diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java similarity index 62% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java index 88f34c2a..451e6bd1 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; - -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MValuePropertyInfo; +package org.jvnet.jaxb3_commons.xml.bind.model.util; + +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MValuePropertyInfo; public class DefaultPropertyInfoVisitor implements MPropertyInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java similarity index 57% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java index f4b79933..c80686b6 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; - -import org.jvnet.jaxb2_commons.xml.bind.model.MBuiltinLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MID; -import org.jvnet.jaxb2_commons.xml.bind.model.MIDREF; -import org.jvnet.jaxb2_commons.xml.bind.model.MIDREFS; -import org.jvnet.jaxb2_commons.xml.bind.model.MList; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MWildcardTypeInfo; +package org.jvnet.jaxb3_commons.xml.bind.model.util; + +import org.jvnet.jaxb3_commons.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MID; +import org.jvnet.jaxb3_commons.xml.bind.model.MIDREF; +import org.jvnet.jaxb3_commons.xml.bind.model.MIDREFS; +import org.jvnet.jaxb3_commons.xml.bind.model.MList; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MWildcardTypeInfo; public class DefaultTypeInfoVisitor implements MTypeInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java similarity index 86% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java index fdf36486..b79d31b2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb3_commons.xml.bind.model.util; import java.util.HashMap; import java.util.Map; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.StringUtils; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.lang.StringUtils; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; public class PackageInfoQNameAnalyzer { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java similarity index 74% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java index 6da1b941..a3ac9d30 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java @@ -1,19 +1,19 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb3_commons.xml.bind.model.util; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElement; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementTypeRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MValuePropertyInfo; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElement; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MValuePropertyInfo; public class QNameCollectingPropertyInfoVisitor implements MPropertyInfoVisitor { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/QNameCollector.java similarity index 73% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/QNameCollector.java index 902cd911..46cdff1e 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/QNameCollector.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb3_commons.xml.bind.model.util; import javax.xml.namespace.QName; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/XmlTypeUtils.java similarity index 90% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/XmlTypeUtils.java index ae282096..521bfdb2 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/bind/model/util/XmlTypeUtils.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb3_commons.xml.bind.model.util; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; +import org.jvnet.jaxb3_commons.lang.Validate; -import com.sun.xml.bind.api.impl.NameConverter; +import org.glassfish.jaxb.core.api.impl.NameConverter; public class XmlTypeUtils { diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/namespace/util/QNameUtils.java similarity index 92% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xml/namespace/util/QNameUtils.java index 6597066b..d3d6a5b9 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xml/namespace/util/QNameUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.namespace.util; +package org.jvnet.jaxb3_commons.xml.namespace.util; import javax.xml.XMLConstants; import javax.xml.namespace.QName; diff --git a/runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java b/runtime/src/main/java/org/jvnet/jaxb3_commons/xmlschema/XmlSchemaConstants.java similarity index 98% rename from runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java rename to runtime/src/main/java/org/jvnet/jaxb3_commons/xmlschema/XmlSchemaConstants.java index 4bcbd417..5e9ef1ce 100644 --- a/runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java +++ b/runtime/src/main/java/org/jvnet/jaxb3_commons/xmlschema/XmlSchemaConstants.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xmlschema; +package org.jvnet.jaxb3_commons.xmlschema; import javax.xml.namespace.QName; diff --git a/runtime/src/main/resources/org/jvnet/jaxb2_commons/locator/messages.properties b/runtime/src/main/resources/org/jvnet/jaxb3_commons/locator/messages.properties similarity index 100% rename from runtime/src/main/resources/org/jvnet/jaxb2_commons/locator/messages.properties rename to runtime/src/main/resources/org/jvnet/jaxb3_commons/locator/messages.properties diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java index 9a7abd6b..b2df16d0 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java @@ -3,13 +3,13 @@ import java.io.IOException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.MarshalException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.MarshalException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.SchemaOutputResolver; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import javax.xml.transform.Result; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; @@ -19,7 +19,7 @@ import org.junit.Test; import org.xml.sax.SAXException; -import com.sun.xml.bind.v2.WellKnownNamespace; +import org.glassfish.jaxb.core.v2.WellKnownNamespace; public class DynamicSchemaTest { diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java index 06c1e505..15cef89b 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java @@ -3,12 +3,12 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.junit.Assert; import org.junit.Test; diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java index 9e8a60f3..1227616a 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java @@ -1,6 +1,6 @@ package org.hisrc.xml.bind.tests.dogs; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; public class Dog extends JAXBElement { diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java index 94388f61..7c9460f1 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java @@ -1,7 +1,7 @@ package org.hisrc.xml.bind.tests.dogs; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java index af1739a2..cad86d9b 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "listOfDogs") public class Dogs { diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java index c3792109..2978e301 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java @@ -1,7 +1,7 @@ package org.hisrc.xml.bind.tests.dogs; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry public class ObjectFactory { diff --git a/runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java b/runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java index 2fc9e799..6c0dff0f 100644 --- a/runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java +++ b/runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java @@ -3,14 +3,14 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import javax.xml.namespace.QName; import org.junit.Test; diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java deleted file mode 100644 index 45da5f36..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java +++ /dev/null @@ -1,150 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests; - -import java.util.Arrays; -import java.util.Collection; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; -import org.jvnet.jaxb2_commons.xml.bind.model.util.XmlTypeUtils; -import org.jvnet.jaxb2_commons.xml.namespace.util.QNameUtils; - -@RunWith(Parameterized.class) -public class XmlTypeUtilsTest { - - @Parameters - public static Collection data() { - return Arrays - .asList(new Object[][] { - // - { - "a1", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A1.class }, - { - "a2", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A2.class }, - { - "AThree", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A3.class }, - { - "AFour", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A4.class }, - { - "{urn:five}AFive", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A5.class }, - { - "a6", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A6.class }, - { - "{urn:seven}a7", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A7.class }, - { - null, - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A8.class }, - { - "{urn:nine}ANine", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha.A9.class }, - { - "a1", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A1.class }, - { - "a2", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A2.class }, - { - "AThree", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A3.class }, - { - "AFour", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A4.class }, - { - "{urn:five}AFive", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A5.class }, - { - "a6", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A6.class }, - { - "{urn:seven}a7", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A7.class }, - { - null, - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A8.class }, - { - "{urn:nine}ANine", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta.A9.class }, - { - "{urn:gamma}a1", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A1.class }, - { - "{urn:gamma}a2", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A2.class }, - { - "{urn:gamma}AThree", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A3.class }, - { - "AFour", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A4.class }, - { - "{urn:five}AFive", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A5.class }, - { - "a6", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A6.class }, - { - "{urn:seven}a7", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A7.class }, - { - null, - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A8.class }, - { - "{urn:nine}ANine", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma.A9.class }, - { - "{urn:delta}a1", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A1.class }, - { - "{urn:delta}a2", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A2.class }, - { - "{urn:delta}AThree", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A3.class }, - { - "AFour", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A4.class }, - { - "{urn:five}five:AFive", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A5.class }, - { - "a6", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A6.class }, - { - "{urn:seven}a7", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A7.class }, - { - null, - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A8.class }, - { - "{urn:nine}ANine", - org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta.A9.class }, - - }); - } - - private final String key; - - private final Class _class; - - public XmlTypeUtilsTest(String key, Class _class) { - this.key = key; - this._class = _class; - } - - @Test - public void producesCorrectTypeName() { - Assert.assertEquals(key, - QNameUtils.getKey(XmlTypeUtils.getTypeName(_class))); - - } - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java deleted file mode 100644 index a5df08db..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -public class A1 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java deleted file mode 100644 index 2c57a028..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType -public class A2 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java deleted file mode 100644 index bfda5b8d..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AThree") -public class A3 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java deleted file mode 100644 index e6425454..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFour", namespace="") -public class A4 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java deleted file mode 100644 index 432f1c12..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFive", namespace="urn:five") -public class A5 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java deleted file mode 100644 index cbc0a58c..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="") -public class A6 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java deleted file mode 100644 index 0f329499..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="urn:seven") -public class A7 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java deleted file mode 100644 index 5cad7cce..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="", namespace="urn:eight") -public class A8 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java deleted file mode 100644 index f98158c9..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name = "ANine", namespace = "urn:nine") -public class A9 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java deleted file mode 100644 index f78db727..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -public class A1 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java deleted file mode 100644 index bd16cf6c..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType -public class A2 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java deleted file mode 100644 index 7620eb55..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AThree") -public class A3 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java deleted file mode 100644 index 66d207c0..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFour", namespace="") -public class A4 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java deleted file mode 100644 index 9eac89e3..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFive", namespace="urn:five") -public class A5 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java deleted file mode 100644 index 3db5b0e9..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="") -public class A6 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java deleted file mode 100644 index 877f7fec..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="urn:seven") -public class A7 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java deleted file mode 100644 index 4d4e9a2d..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="", namespace="urn:eight") -public class A8 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java deleted file mode 100644 index 35a0d687..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name = "ANine", namespace = "urn:nine") -public class A9 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java deleted file mode 100644 index bd8b552e..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@XmlSchema -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; - -import javax.xml.bind.annotation.XmlSchema; - diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java deleted file mode 100644 index b3bb6ba4..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -public class A1 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java deleted file mode 100644 index 9f8c58af..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType -public class A2 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java deleted file mode 100644 index e8a80240..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AThree") -public class A3 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java deleted file mode 100644 index 1e8df0e0..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFour", namespace="") -public class A4 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java deleted file mode 100644 index 2637faf7..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFive", namespace="urn:five") -public class A5 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java deleted file mode 100644 index f64da04f..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="") -public class A6 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java deleted file mode 100644 index cfc031b2..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="urn:seven") -public class A7 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java deleted file mode 100644 index 6181b3ef..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="", namespace="urn:eight") -public class A8 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java deleted file mode 100644 index b92147d7..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name = "ANine", namespace = "urn:nine") -public class A9 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java deleted file mode 100644 index 83ec9706..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -public class A1 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java deleted file mode 100644 index 2190cc06..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType -public class A2 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java deleted file mode 100644 index fd779ee8..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AThree") -public class A3 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java deleted file mode 100644 index 46fa6fc6..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFour", namespace="") -public class A4 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java deleted file mode 100644 index e7833b6b..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="AFive", namespace="urn:five") -public class A5 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java deleted file mode 100644 index c54c54d4..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="") -public class A6 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java deleted file mode 100644 index 1ece4e7e..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(namespace="urn:seven") -public class A7 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java deleted file mode 100644 index 23205832..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name="", namespace="urn:eight") -public class A8 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java deleted file mode 100644 index 21afcdea..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlType; - -@XmlType(name = "ANine", namespace = "urn:nine") -public class A9 { - -} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java b/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java deleted file mode 100644 index add8df02..00000000 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@XmlSchema(namespace = "urn:gamma") -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; - -import javax.xml.bind.annotation.XmlSchema; - diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/lang/tests/CopyStrategyTest.java similarity index 79% rename from runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java rename to runtime/src/test/java/org/jvnet/jaxb3_commons/lang/tests/CopyStrategyTest.java index b30adbb8..b2ab0eab 100644 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/lang/tests/CopyStrategyTest.java @@ -1,20 +1,20 @@ -package org.jvnet.jaxb2_commons.lang.tests; +package org.jvnet.jaxb3_commons.lang.tests; import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; -import org.jvnet.jaxb2_commons.lang.CopyStrategy2; -import org.jvnet.jaxb2_commons.lang.CopyTo2; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.lang.CopyStrategy2; +import org.jvnet.jaxb3_commons.lang.CopyTo2; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/lang/tests/CyclicTests.java similarity index 85% rename from runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java rename to runtime/src/test/java/org/jvnet/jaxb3_commons/lang/tests/CyclicTests.java index 50df5267..77efc797 100644 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/lang/tests/CyclicTests.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.lang.tests; +package org.jvnet.jaxb3_commons.lang.tests; import java.util.IdentityHashMap; import java.util.Map; import junit.framework.TestCase; -import org.jvnet.jaxb2_commons.lang.CopyStrategy2; -import org.jvnet.jaxb2_commons.lang.CopyTo2; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.locator.DefaultRootObjectLocator; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; +import org.jvnet.jaxb3_commons.lang.CopyStrategy2; +import org.jvnet.jaxb3_commons.lang.CopyTo2; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.locator.DefaultRootObjectLocator; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.locator.util.LocatorUtils; public class CyclicTests extends TestCase { diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java new file mode 100644 index 00000000..80855774 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java @@ -0,0 +1,150 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests; + +import java.util.Arrays; +import java.util.Collection; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import org.jvnet.jaxb3_commons.xml.bind.model.util.XmlTypeUtils; +import org.jvnet.jaxb3_commons.xml.namespace.util.QNameUtils; + +@RunWith(Parameterized.class) +public class XmlTypeUtilsTest { + + @Parameters + public static Collection data() { + return Arrays + .asList(new Object[][] { + // + { + "a1", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A1.class }, + { + "a2", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A2.class }, + { + "AThree", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A3.class }, + { + "AFour", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A4.class }, + { + "{urn:five}AFive", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A5.class }, + { + "a6", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A7.class }, + { + null, + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha.A9.class }, + { + "a1", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A1.class }, + { + "a2", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A2.class }, + { + "AThree", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A3.class }, + { + "AFour", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A4.class }, + { + "{urn:five}AFive", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A5.class }, + { + "a6", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A7.class }, + { + null, + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta.A9.class }, + { + "{urn:gamma}a1", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A1.class }, + { + "{urn:gamma}a2", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A2.class }, + { + "{urn:gamma}AThree", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A3.class }, + { + "AFour", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A4.class }, + { + "{urn:five}AFive", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A5.class }, + { + "a6", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A7.class }, + { + null, + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma.A9.class }, + { + "{urn:delta}a1", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A1.class }, + { + "{urn:delta}a2", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A2.class }, + { + "{urn:delta}AThree", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A3.class }, + { + "AFour", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A4.class }, + { + "{urn:five}five:AFive", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A5.class }, + { + "a6", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A7.class }, + { + null, + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta.A9.class }, + + }); + } + + private final String key; + + private final Class _class; + + public XmlTypeUtilsTest(String key, Class _class) { + this.key = key; + this._class = _class; + } + + @Test + public void producesCorrectTypeName() { + Assert.assertEquals(key, + QNameUtils.getKey(XmlTypeUtils.getTypeName(_class))); + + } + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A1.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A1.java new file mode 100644 index 00000000..e0b33b8c --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +public class A1 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A2.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A2.java new file mode 100644 index 00000000..c0cdafd8 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A2.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType +public class A2 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A3.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A3.java new file mode 100644 index 00000000..eee67235 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A3.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AThree") +public class A3 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A4.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A4.java new file mode 100644 index 00000000..fc306b24 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A4.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFour", namespace="") +public class A4 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A5.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A5.java new file mode 100644 index 00000000..31dfd01d --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A5.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFive", namespace="urn:five") +public class A5 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A6.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A6.java new file mode 100644 index 00000000..298c3af3 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A6.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="") +public class A6 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A7.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A7.java new file mode 100644 index 00000000..475aa42c --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A7.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="urn:seven") +public class A7 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A8.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A8.java new file mode 100644 index 00000000..4b03215c --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A8.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="", namespace="urn:eight") +public class A8 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A9.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A9.java new file mode 100644 index 00000000..6ab24db5 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/alpha/A9.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.alpha; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name = "ANine", namespace = "urn:nine") +public class A9 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A1.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A1.java new file mode 100644 index 00000000..307aaf60 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +public class A1 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A2.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A2.java new file mode 100644 index 00000000..3a69e148 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A2.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType +public class A2 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A3.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A3.java new file mode 100644 index 00000000..1a3ff7d4 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A3.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AThree") +public class A3 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A4.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A4.java new file mode 100644 index 00000000..0b722fc5 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A4.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFour", namespace="") +public class A4 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A5.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A5.java new file mode 100644 index 00000000..4f47deeb --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A5.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFive", namespace="urn:five") +public class A5 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A6.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A6.java new file mode 100644 index 00000000..5b04ca34 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A6.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="") +public class A6 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A7.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A7.java new file mode 100644 index 00000000..f80ab571 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A7.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="urn:seven") +public class A7 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A8.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A8.java new file mode 100644 index 00000000..7d6a94eb --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A8.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="", namespace="urn:eight") +public class A8 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A9.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A9.java new file mode 100644 index 00000000..ebde6dc5 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/A9.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name = "ANine", namespace = "urn:nine") +public class A9 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/package-info.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/package-info.java new file mode 100644 index 00000000..692f504f --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/beta/package-info.java @@ -0,0 +1,5 @@ +@XmlSchema +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlSchema; + diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A1.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A1.java new file mode 100644 index 00000000..4c3b696a --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +public class A1 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A2.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A2.java new file mode 100644 index 00000000..2fd950f5 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A2.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType +public class A2 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A3.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A3.java new file mode 100644 index 00000000..54923cfe --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A3.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AThree") +public class A3 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A4.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A4.java new file mode 100644 index 00000000..723e190c --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A4.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFour", namespace="") +public class A4 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A5.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A5.java new file mode 100644 index 00000000..6a32c59d --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A5.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFive", namespace="urn:five") +public class A5 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A6.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A6.java new file mode 100644 index 00000000..4c2af667 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A6.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="") +public class A6 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A7.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A7.java new file mode 100644 index 00000000..6fbc387b --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A7.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="urn:seven") +public class A7 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A8.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A8.java new file mode 100644 index 00000000..f5cf24fc --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A8.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="", namespace="urn:eight") +public class A8 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A9.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A9.java new file mode 100644 index 00000000..0ea9ef05 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/A9.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name = "ANine", namespace = "urn:nine") +public class A9 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/package-info.java similarity index 51% rename from runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java rename to runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/package-info.java index 8f0e57f7..c6cefa0a 100644 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/delta/package-info.java @@ -1,8 +1,8 @@ @XmlSchema(namespace = "urn:delta", xmlns = { @XmlNs(namespaceURI = "urn:five", prefix = "five"), @XmlNs(namespaceURI = "urn:eight", prefix = "eight") }) -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.delta; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A1.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A1.java new file mode 100644 index 00000000..4d417e82 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +public class A1 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A2.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A2.java new file mode 100644 index 00000000..68327b6e --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A2.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType +public class A2 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A3.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A3.java new file mode 100644 index 00000000..92064d9c --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A3.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AThree") +public class A3 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A4.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A4.java new file mode 100644 index 00000000..b4f19cd9 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A4.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFour", namespace="") +public class A4 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A5.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A5.java new file mode 100644 index 00000000..ac76e0e5 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A5.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="AFive", namespace="urn:five") +public class A5 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A6.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A6.java new file mode 100644 index 00000000..7f2e1fc1 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A6.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="") +public class A6 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A7.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A7.java new file mode 100644 index 00000000..7fe8f0ce --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A7.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(namespace="urn:seven") +public class A7 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A8.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A8.java new file mode 100644 index 00000000..97abd88e --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A8.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name="", namespace="urn:eight") +public class A8 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A9.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A9.java new file mode 100644 index 00000000..1e93365a --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/A9.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name = "ANine", namespace = "urn:nine") +public class A9 { + +} diff --git a/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/package-info.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/package-info.java new file mode 100644 index 00000000..8b439f79 --- /dev/null +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/bind/model/util/tests/gamma/package-info.java @@ -0,0 +1,5 @@ +@XmlSchema(namespace = "urn:gamma") +package org.jvnet.jaxb3_commons.xml.bind.model.util.tests.gamma; + +import jakarta.xml.bind.annotation.XmlSchema; + diff --git a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/namespace/util/tests/QNameUtilsTest.java similarity index 80% rename from runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java rename to runtime/src/test/java/org/jvnet/jaxb3_commons/xml/namespace/util/tests/QNameUtilsTest.java index 4798157c..6b50cef6 100644 --- a/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java +++ b/runtime/src/test/java/org/jvnet/jaxb3_commons/xml/namespace/util/tests/QNameUtilsTest.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.namespace.util.tests; +package org.jvnet.jaxb3_commons.xml.namespace.util.tests; import javax.xml.namespace.QName; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.xml.namespace.util.QNameUtils; +import org.jvnet.jaxb3_commons.xml.namespace.util.QNameUtils; public class QNameUtilsTest { diff --git a/runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml b/runtime/src/test/resources/org/jvnet/jaxb3_commons/lang/tests/Test[0].xml similarity index 100% rename from runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml rename to runtime/src/test/resources/org/jvnet/jaxb3_commons/lang/tests/Test[0].xml diff --git a/samples/basic/pom.xml b/samples/basic/pom.xml index cb41c023..84d5ba1d 100644 --- a/samples/basic/pom.xml +++ b/samples/basic/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - jaxb2-basics-sample-basic + jaxb3-basics-sample-basic pom - JAXB2 Basics - Sample [basic] + JAXB3 Basics - Sample [basic] - org.jvnet.jaxb2_commons - jaxb2-basics-samples - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-samples + 3.0.0-SNAPSHOT @@ -16,16 +16,16 @@ junit - org.jvnet.jaxb2_commons - jaxb2-basics-plugins + org.jvnet.jaxb3_commons + jaxb3-basics-plugins - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing - org.jvnet.jaxb2_commons - jaxb2-basics-ant + org.jvnet.jaxb3_commons + jaxb3-basics-ant org.glassfish.jaxb @@ -33,7 +33,7 @@ com.sun.activation - javax.activation + jakarta.activation org.glassfish.jaxb diff --git a/samples/basic/project-build.xml b/samples/basic/project-build.xml index 4b77576f..a29aa931 100644 --- a/samples/basic/project-build.xml +++ b/samples/basic/project-build.xml @@ -1,13 +1,13 @@ - - + + - + @@ -18,15 +18,15 @@ - + - + - + @@ -42,15 +42,15 @@ - + - + - + @@ -69,13 +69,13 @@ - + - + @@ -83,7 +83,7 @@ - + @@ -110,7 +110,7 @@ - + diff --git a/samples/basic/project-pom.xml b/samples/basic/project-pom.xml index eb5df92f..0331b511 100644 --- a/samples/basic/project-pom.xml +++ b/samples/basic/project-pom.xml @@ -2,11 +2,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-sample-basic-maven + org.jvnet.jaxb3_commons + jaxb3-basics-sample-basic-maven ${project.version} jar - JAXB2 Basics - Sample [basic-maven] + JAXB3 Basics - Sample [basic-maven] org.glassfish.jaxb @@ -16,18 +16,18 @@ com.sun.activation - javax.activation + jakarta.activation ${activation.version} provided - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing ${project.version} test @@ -42,9 +42,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb3-maven-plugin + ${maven-jaxb3-plugin.version} @@ -63,8 +63,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics ${project.version} diff --git a/samples/basic/src/main/resources/schema.xsd b/samples/basic/src/main/resources/schema.xsd index b16a1b07..48792001 100644 --- a/samples/basic/src/main/resources/schema.xsd +++ b/samples/basic/src/main/resources/schema.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> @@ -10,7 +10,7 @@ - + diff --git a/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java b/samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/CopyableTest.java similarity index 68% rename from samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java rename to samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/CopyableTest.java index 4ed92a96..732ef472 100644 --- a/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java +++ b/samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/CopyableTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; import org.junit.Assert; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class CopyableTest extends AbstractSamplesTest { diff --git a/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java b/samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/EqualsTest.java similarity index 72% rename from samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java rename to samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/EqualsTest.java index ac2dbc9b..87d7037d 100644 --- a/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java +++ b/samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/EqualsTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java b/samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/ToStringTest.java similarity index 68% rename from samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java rename to samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/ToStringTest.java index 7aa6b233..f50bf1af 100644 --- a/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java +++ b/samples/basic/src/test/java/org/jvnet/jaxb3_commons/tests/one/ToStringTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; public class ToStringTest extends AbstractSamplesTest { diff --git a/samples/cxf/pom.xml b/samples/cxf/pom.xml index c2eaf74c..02b3cc3a 100644 --- a/samples/cxf/pom.xml +++ b/samples/cxf/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - jaxb2-basics-sample-cxf + jaxb3-basics-sample-cxf pom - JAXB2 Basics - Sample [cxf] + JAXB3 Basics - Sample [cxf] - org.jvnet.jaxb2_commons - jaxb2-basics-samples - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-samples + 3.0.0-SNAPSHOT @@ -16,16 +16,16 @@ junit - org.jvnet.jaxb2_commons - jaxb2-basics-plugins + org.jvnet.jaxb3_commons + jaxb3-basics-plugins - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing - org.jvnet.jaxb2_commons - jaxb2-basics-ant + org.jvnet.jaxb3_commons + jaxb3-basics-ant org.glassfish.jaxb @@ -33,7 +33,7 @@ com.sun.activation - javax.activation + jakarta.activation org.glassfish.jaxb @@ -43,10 +43,11 @@ org.slf4j slf4j-simple - org.apache.cxf - cxf-codegen-plugin - ${cxf-codegen-plugin.version} - + + org.apache.cxf + cxf-codegen-plugin + ${cxf-codegen-plugin.version} + install diff --git a/samples/cxf/project-pom.xml b/samples/cxf/project-pom.xml index de3455dd..61cb1cbf 100644 --- a/samples/cxf/project-pom.xml +++ b/samples/cxf/project-pom.xml @@ -2,24 +2,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-sample-cxf-maven + org.jvnet.jaxb3_commons + jaxb3-basics-sample-cxf-maven ${project.version} jar JAXB2 Basics - Sample [cxf-maven] - - javax.xml.ws - jaxws-api - 2.3.1 - provided - - - javax.jws - javax.jws-api - 1.1 - provided - + + jakarta.xml.ws + jakarta.xml.ws-api + 3.0.1 + provided + + + jakarta.jws + jakarta.jws-api + 3.0.0 + provided + org.glassfish.jaxb jaxb-runtime @@ -28,13 +28,13 @@ com.sun.activation - javax.activation + jakarta.activation ${activation.version} provided - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime ${project.version} @@ -46,8 +46,8 @@ maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 @@ -83,23 +83,23 @@ - org.glassfish.jaxb - jaxb-runtime - ${jaxb.version} - + org.glassfish.jaxb + jaxb-runtime + ${jaxb.version} + - org.glassfish.jaxb + org.glassfish.jaxb jaxb-xjc ${jaxb.version} - org.glassfish.jaxb + org.glassfish.jaxb jaxb-core ${jaxb-core.version} - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics ${project.version} diff --git a/samples/cxf/src/main/resources/bindings.xjb b/samples/cxf/src/main/resources/bindings.xjb index e21a2619..a4c643f5 100644 --- a/samples/cxf/src/main/resources/bindings.xjb +++ b/samples/cxf/src/main/resources/bindings.xjb @@ -29,13 +29,13 @@ --> + jaxb:version="3.0"> - + diff --git a/samples/cxf/src/main/resources/wsdl-bindings.xjb b/samples/cxf/src/main/resources/wsdl-bindings.xjb index 88d64551..506b5005 100644 --- a/samples/cxf/src/main/resources/wsdl-bindings.xjb +++ b/samples/cxf/src/main/resources/wsdl-bindings.xjb @@ -33,14 +33,14 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" - xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"> - + - + diff --git a/samples/po-simple/pom.xml b/samples/po-simple/pom.xml index f4c36e5e..f9b049ab 100644 --- a/samples/po-simple/pom.xml +++ b/samples/po-simple/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - jaxb2-basics-sample-po-simple + jaxb3-basics-sample-po-simple pom - JAXB2 Basics - Sample [po-simple] + JAXB3 Basics - Sample [po-simple] - org.jvnet.jaxb2_commons - jaxb2-basics-samples - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-samples + 3.0.0-SNAPSHOT @@ -16,16 +16,16 @@ junit - org.jvnet.jaxb2_commons - jaxb2-basics-plugins + org.jvnet.jaxb3_commons + jaxb3-basics-plugins - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing - org.jvnet.jaxb2_commons - jaxb2-basics-ant + org.jvnet.jaxb3_commons + jaxb3-basics-ant org.glassfish.jaxb @@ -37,7 +37,7 @@ com.sun.activation - javax.activation + jakarta.activation org.slf4j diff --git a/samples/po-simple/project-build.xml b/samples/po-simple/project-build.xml index 1a250c0c..7de2f817 100644 --- a/samples/po-simple/project-build.xml +++ b/samples/po-simple/project-build.xml @@ -1,13 +1,13 @@ - - + + - + @@ -18,7 +18,7 @@ - + @@ -28,9 +28,9 @@ - + - + @@ -42,15 +42,15 @@ - + - + - + @@ -68,20 +68,20 @@ - + - + - + @@ -105,7 +105,7 @@ - + diff --git a/samples/po-simple/project-pom.xml b/samples/po-simple/project-pom.xml index 7ae6731c..01c0d641 100644 --- a/samples/po-simple/project-pom.xml +++ b/samples/po-simple/project-pom.xml @@ -2,11 +2,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-sample-po-maven + org.jvnet.jaxb3_commons + jaxb3-basics-sample-po-maven ${project.version} jar - JAXB2 Basics - Sample [po-maven] + JAXB3 Basics - Sample [po-maven] org.glassfish.jaxb @@ -16,13 +16,13 @@ com.sun.activation - javax.activation + jakarta.activation ${activation.version} provided - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing ${project.version} test @@ -37,9 +37,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb3-maven-plugin + ${maven-jaxb3-plugin.version} @@ -54,8 +54,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics ${project.version} diff --git a/samples/po-simple/src/main/resources/bindings.xjb b/samples/po-simple/src/main/resources/bindings.xjb index 249cb365..60e747b5 100644 --- a/samples/po-simple/src/main/resources/bindings.xjb +++ b/samples/po-simple/src/main/resources/bindings.xjb @@ -1,12 +1,12 @@ - + diff --git a/samples/po-simple/src/test/java/org/jvnet/jaxb2_commons/tests/posimple/EqualsTest.java b/samples/po-simple/src/test/java/org/jvnet/jaxb3_commons/tests/posimple/EqualsTest.java similarity index 76% rename from samples/po-simple/src/test/java/org/jvnet/jaxb2_commons/tests/posimple/EqualsTest.java rename to samples/po-simple/src/test/java/org/jvnet/jaxb3_commons/tests/posimple/EqualsTest.java index c7ab5894..de373c34 100644 --- a/samples/po-simple/src/test/java/org/jvnet/jaxb2_commons/tests/posimple/EqualsTest.java +++ b/samples/po-simple/src/test/java/org/jvnet/jaxb3_commons/tests/posimple/EqualsTest.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.tests.posimple; +package org.jvnet.jaxb3_commons.tests.posimple; import java.io.File; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/samples/po/pom.xml b/samples/po/pom.xml index 8447f677..971b5a7c 100644 --- a/samples/po/pom.xml +++ b/samples/po/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - jaxb2-basics-sample-po + jaxb3-basics-sample-po pom - JAXB2 Basics - Sample [po] + JAXB3 Basics - Sample [po] - org.jvnet.jaxb2_commons - jaxb2-basics-samples - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-samples + 3.0.0-SNAPSHOT @@ -16,16 +16,16 @@ junit - org.jvnet.jaxb2_commons - jaxb2-basics-plugins + org.jvnet.jaxb3_commons + jaxb3-basics-plugins - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing - org.jvnet.jaxb2_commons - jaxb2-basics-ant + org.jvnet.jaxb3_commons + jaxb3-basics-ant org.glassfish.jaxb @@ -33,7 +33,7 @@ com.sun.activation - javax.activation + jakarta.activation org.glassfish.jaxb diff --git a/samples/po/project-build.xml b/samples/po/project-build.xml index ef51076a..77e57ff7 100644 --- a/samples/po/project-build.xml +++ b/samples/po/project-build.xml @@ -1,13 +1,13 @@ - - + + - + @@ -18,15 +18,15 @@ - + - + - + @@ -42,15 +42,15 @@ - + - + - + @@ -69,13 +69,13 @@ - + - + @@ -83,7 +83,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/samples/po/project-pom.xml b/samples/po/project-pom.xml index 492a4184..45150c4f 100644 --- a/samples/po/project-pom.xml +++ b/samples/po/project-pom.xml @@ -2,11 +2,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-sample-po-maven + org.jvnet.jaxb3_commons + jaxb3-basics-sample-po-maven ${project.version} jar - JAXB2 Basics - Sample [po-maven] + JAXB3 Basics - Sample [po-maven] org.glassfish.jaxb @@ -16,18 +16,18 @@ com.sun.activation - javax.activation + jakarta.activation ${activation.version} provided - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime ${project.version} - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing ${project.version} test @@ -42,9 +42,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb3-maven-plugin + ${maven-jaxb3-plugin.version} @@ -63,8 +63,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics ${project.version} diff --git a/samples/po/src/main/resources/bindings.xjb b/samples/po/src/main/resources/bindings.xjb index 115c5a0e..eb661a56 100644 --- a/samples/po/src/main/resources/bindings.xjb +++ b/samples/po/src/main/resources/bindings.xjb @@ -1,12 +1,12 @@ - + diff --git a/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/CopyableTest.java b/samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/CopyableTest.java similarity index 68% rename from samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/CopyableTest.java rename to samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/CopyableTest.java index c0ad4145..c02c36dc 100644 --- a/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/CopyableTest.java +++ b/samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/CopyableTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.tests.po; +package org.jvnet.jaxb3_commons.tests.po; import java.io.File; import org.junit.Assert; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class CopyableTest extends AbstractSamplesTest { diff --git a/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/EqualsTest.java b/samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/EqualsTest.java similarity index 72% rename from samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/EqualsTest.java rename to samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/EqualsTest.java index c7194a6f..8162ba34 100644 --- a/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/EqualsTest.java +++ b/samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/EqualsTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.po; +package org.jvnet.jaxb3_commons.tests.po; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/ToStringTest.java b/samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/ToStringTest.java similarity index 69% rename from samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/ToStringTest.java rename to samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/ToStringTest.java index fb8cb6be..bf784eea 100644 --- a/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/ToStringTest.java +++ b/samples/po/src/test/java/org/jvnet/jaxb3_commons/tests/po/ToStringTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.po; +package org.jvnet.jaxb3_commons.tests.po; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; public class ToStringTest extends AbstractSamplesTest { diff --git a/samples/pom.xml b/samples/pom.xml index 139b7c2d..5f3374ec 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - jaxb2-basics-samples + jaxb3-basics-samples pom - JAXB2 Basics - Samples + JAXB3 Basics - Samples - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT po diff --git a/testing/pom.xml b/testing/pom.xml index 20b1f835..5fe25d62 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - jaxb2-basics-testing + jaxb3-basics-testing jar - JAXB2 Basics - Testing + JAXB3 Basics - Testing - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT @@ -24,16 +24,16 @@ commons-io - org.jvnet.jaxb2_commons - jaxb2-basics-tools + org.jvnet.jaxb3_commons + jaxb3-basics-tools - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java b/testing/src/main/java/org/jvnet/jaxb3_commons/lang/ExtendedJAXBEqualsStrategy.java similarity index 90% rename from testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java rename to testing/src/main/java/org/jvnet/jaxb3_commons/lang/ExtendedJAXBEqualsStrategy.java index 4287b8a6..ad8a415d 100644 --- a/testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java +++ b/testing/src/main/java/org/jvnet/jaxb3_commons/lang/ExtendedJAXBEqualsStrategy.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb3_commons.lang; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.transform.dom.DOMSource; import org.custommonkey.xmlunit.Diff; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; import org.w3c.dom.Node; public class ExtendedJAXBEqualsStrategy extends JAXBEqualsStrategy { diff --git a/testing/src/main/java/org/jvnet/jaxb2_commons/test/AbstractSamplesTest.java b/testing/src/main/java/org/jvnet/jaxb3_commons/test/AbstractSamplesTest.java similarity index 96% rename from testing/src/main/java/org/jvnet/jaxb2_commons/test/AbstractSamplesTest.java rename to testing/src/main/java/org/jvnet/jaxb3_commons/test/AbstractSamplesTest.java index 280eda54..10df5b8d 100644 --- a/testing/src/main/java/org/jvnet/jaxb2_commons/test/AbstractSamplesTest.java +++ b/testing/src/main/java/org/jvnet/jaxb3_commons/test/AbstractSamplesTest.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.test; +package org.jvnet.jaxb3_commons.test; import java.io.File; import java.util.Collection; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import org.junit.Assert; import junit.framework.TestCase; diff --git a/testing/src/test/java/org/jvnet/jaxb2_commons/test/tests/TrivialSamplesTest.java b/testing/src/test/java/org/jvnet/jaxb3_commons/test/tests/TrivialSamplesTest.java similarity index 70% rename from testing/src/test/java/org/jvnet/jaxb2_commons/test/tests/TrivialSamplesTest.java rename to testing/src/test/java/org/jvnet/jaxb3_commons/test/tests/TrivialSamplesTest.java index 613f81ed..9c0b6af2 100644 --- a/testing/src/test/java/org/jvnet/jaxb2_commons/test/tests/TrivialSamplesTest.java +++ b/testing/src/test/java/org/jvnet/jaxb3_commons/test/tests/TrivialSamplesTest.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.test.tests; +package org.jvnet.jaxb3_commons.test.tests; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class TrivialSamplesTest extends AbstractSamplesTest { diff --git a/tests/JAXB-1058/pom.xml b/tests/JAXB-1058/pom.xml index 324c3482..25b72200 100644 --- a/tests/JAXB-1058/pom.xml +++ b/tests/JAXB-1058/pom.xml @@ -3,30 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-JAXB-1058 + jaxb3-basics-test-JAXB-1058 jar - JAXB2 Basics - Test [JAXB-1058] + JAXB3 Basics - Test [JAXB-1058] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -34,8 +34,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/JAXB-1058/src/main/resources/schema.xsd b/tests/JAXB-1058/src/main/resources/schema.xsd index 7c7ac881..a77aeb15 100644 --- a/tests/JAXB-1058/src/main/resources/schema.xsd +++ b/tests/JAXB-1058/src/main/resources/schema.xsd @@ -5,15 +5,15 @@ targetNamespace="urn:test" elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - jaxb:version="2.1"> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> - + diff --git a/tests/JAXB-1058/src/test/java/org/jvnet/jaxb2_commons/tests/JAXB_1058/ExecuteJAXB1058.java b/tests/JAXB-1058/src/test/java/org/jvnet/jaxb3_commons/tests/JAXB_1058/ExecuteJAXB1058.java similarity index 95% rename from tests/JAXB-1058/src/test/java/org/jvnet/jaxb2_commons/tests/JAXB_1058/ExecuteJAXB1058.java rename to tests/JAXB-1058/src/test/java/org/jvnet/jaxb3_commons/tests/JAXB_1058/ExecuteJAXB1058.java index c6d877a8..ed0b8c9a 100644 --- a/tests/JAXB-1058/src/test/java/org/jvnet/jaxb2_commons/tests/JAXB_1058/ExecuteJAXB1058.java +++ b/tests/JAXB-1058/src/test/java/org/jvnet/jaxb3_commons/tests/JAXB_1058/ExecuteJAXB1058.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.JAXB_1058; +package org.jvnet.jaxb3_commons.tests.JAXB_1058; import java.io.File; diff --git a/tests/commons_lang/pom.xml b/tests/commons_lang/pom.xml new file mode 100644 index 00000000..2552cdae --- /dev/null +++ b/tests/commons_lang/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT + + jaxb3-basics-test-commonslang + jar + JAXB3 Basics - Test [commons_lang] + + + org.jvnet.jaxb + jaxb3-maven-plugin-testing + test + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + test + + + org.jvnet.jaxb + jaxb3-maven-plugin + + true + + -Xcommons-lang + + + + org.jvnet.jaxb3_commons + jaxb3-basics + + + + + + + diff --git a/tests/commons_lang/src/main/resources/Person.xsd b/tests/commons_lang/src/main/resources/Person.xsd new file mode 100644 index 00000000..5e816d75 --- /dev/null +++ b/tests/commons_lang/src/main/resources/Person.xsd @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/commons_lang/src/test/java/org/jvnet/jaxb3_commons/tests/commons_lang/AddressTest.java b/tests/commons_lang/src/test/java/org/jvnet/jaxb3_commons/tests/commons_lang/AddressTest.java new file mode 100644 index 00000000..998c5b55 --- /dev/null +++ b/tests/commons_lang/src/test/java/org/jvnet/jaxb3_commons/tests/commons_lang/AddressTest.java @@ -0,0 +1,22 @@ +package org.jvnet.jaxb3_commons.tests.commons_lang; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.junit.Assert; +import org.junit.Test; + +import generated.Address; + +public class AddressTest { + + @Test + public void testAddress() { + Address a = new Address(); + // No plugin default-value present, checking everything is null or default java value + Assert.assertEquals(0, a.getNumber()); + Assert.assertNull(a.getCareOf()); + Assert.assertNull(a.getStreet()); + + Assert.assertEquals(ToStringBuilder.reflectionToString(a, ToStringStyle.MULTI_LINE_STYLE), a.toString()); + } +} diff --git a/tests/commons_lang/src/test/java/org/jvnet/jaxb3_commons/tests/commons_lang/PersonTest.java b/tests/commons_lang/src/test/java/org/jvnet/jaxb3_commons/tests/commons_lang/PersonTest.java new file mode 100644 index 00000000..eccfd2af --- /dev/null +++ b/tests/commons_lang/src/test/java/org/jvnet/jaxb3_commons/tests/commons_lang/PersonTest.java @@ -0,0 +1,20 @@ +package org.jvnet.jaxb3_commons.tests.commons_lang; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.junit.Assert; +import org.junit.Test; + +import generated.Person; + +public class PersonTest { + + @Test + public void testPerson() { + Person p = new Person(); + // No plugin default-value present, checking everything is null or default java value + Assert.assertEquals(false, p.isMailingAddressIdentical()); + + Assert.assertEquals(ToStringBuilder.reflectionToString(p, ToStringStyle.MULTI_LINE_STYLE), p.toString()); + } +} diff --git a/tests/commons_lang/src/test/resources/log4j.properties b/tests/commons_lang/src/test/resources/log4j.properties new file mode 100644 index 00000000..9c985635 --- /dev/null +++ b/tests/commons_lang/src/test/resources/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootCategory=DEBUG, stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.target=system.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n \ No newline at end of file diff --git a/tests/defaultvalue/pom.xml b/tests/defaultvalue/pom.xml new file mode 100644 index 00000000..8d4bd474 --- /dev/null +++ b/tests/defaultvalue/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT + + jaxb3-basics-test-defaultvalue + jar + JAXB3 Basics - Test [default-value] + + + org.jvnet.jaxb + jaxb3-maven-plugin-testing + test + + + org.jvnet.jaxb3_commons + jaxb3-basics + + + + test + + + org.jvnet.jaxb + jaxb3-maven-plugin + + true + + -Xdefault-value + + + + org.jvnet.jaxb3_commons + jaxb3-basics + + + + + + + diff --git a/tests/defaultvalue/src/main/resources/Person.xsd b/tests/defaultvalue/src/main/resources/Person.xsd new file mode 100644 index 00000000..5e816d75 --- /dev/null +++ b/tests/defaultvalue/src/main/resources/Person.xsd @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/defaultvalue/src/test/java/org/jvnet/jaxb3_commons/tests/defaultvalue/AddressTest.java b/tests/defaultvalue/src/test/java/org/jvnet/jaxb3_commons/tests/defaultvalue/AddressTest.java new file mode 100644 index 00000000..83fd1377 --- /dev/null +++ b/tests/defaultvalue/src/test/java/org/jvnet/jaxb3_commons/tests/defaultvalue/AddressTest.java @@ -0,0 +1,18 @@ +package org.jvnet.jaxb3_commons.tests.defaultvalue; + +import org.junit.Assert; +import org.junit.Test; + +import generated.Address; + +public class AddressTest { + + @Test + public void testAddress() { + Address a = new Address(); + Assert.assertEquals(42, a.getNumber()); + Assert.assertEquals("none", a.getCareOf()); + // no default value for street + Assert.assertNull(a.getStreet()); + } +} diff --git a/tests/defaultvalue/src/test/java/org/jvnet/jaxb3_commons/tests/defaultvalue/PersonTest.java b/tests/defaultvalue/src/test/java/org/jvnet/jaxb3_commons/tests/defaultvalue/PersonTest.java new file mode 100644 index 00000000..5c812820 --- /dev/null +++ b/tests/defaultvalue/src/test/java/org/jvnet/jaxb3_commons/tests/defaultvalue/PersonTest.java @@ -0,0 +1,15 @@ +package org.jvnet.jaxb3_commons.tests.defaultvalue; + +import org.junit.Assert; +import org.junit.Test; + +import generated.Person; + +public class PersonTest { + + @Test + public void testPerson() { + Person p = new Person(); + Assert.assertEquals(true, p.isMailingAddressIdentical()); + } +} diff --git a/tests/defaultvalue/src/test/resources/log4j.properties b/tests/defaultvalue/src/test/resources/log4j.properties new file mode 100644 index 00000000..9c985635 --- /dev/null +++ b/tests/defaultvalue/src/test/resources/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootCategory=DEBUG, stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.target=system.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n \ No newline at end of file diff --git a/tests/episodes/a/pom.xml b/tests/episodes/a/pom.xml index 938ee269..60ef64b0 100644 --- a/tests/episodes/a/pom.xml +++ b/tests/episodes/a/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-test-episodes - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-test-episodes + 3.0.0-SNAPSHOT - jaxb2-basics-test-episodes-a + jaxb3-basics-test-episodes-a jar - JAXB2 Basics - Test [episodes-a] + JAXB3 Basics - Test [episodes-a] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -27,8 +27,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/episodes/a/src/main/resources/binding.xjb b/tests/episodes/a/src/main/resources/binding.xjb index d5a94e1b..5e0d6316 100644 --- a/tests/episodes/a/src/main/resources/binding.xjb +++ b/tests/episodes/a/src/main/resources/binding.xjb @@ -1,6 +1,6 @@ - + diff --git a/tests/episodes/b/pom.xml b/tests/episodes/b/pom.xml index 3629501a..4c8d122b 100644 --- a/tests/episodes/b/pom.xml +++ b/tests/episodes/b/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-test-episodes - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-test-episodes + 3.0.0-SNAPSHOT - jaxb2-basics-test-episodes-b + jaxb3-basics-test-episodes-b jar - JAXB2 Basics - Test [episodes-b] + JAXB3 Basics - Test [episodes-b] - org.jvnet.jaxb2_commons - jaxb2-basics-test-episodes-a + org.jvnet.jaxb3_commons + jaxb3-basics-test-episodes-a ${project.version} @@ -21,8 +21,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -34,14 +34,14 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics - org.jvnet.jaxb2_commons - jaxb2-basics-test-episodes-a + org.jvnet.jaxb3_commons + jaxb3-basics-test-episodes-a diff --git a/tests/episodes/b/src/main/resources/binding.xjb b/tests/episodes/b/src/main/resources/binding.xjb index 4725321b..365dd86c 100644 --- a/tests/episodes/b/src/main/resources/binding.xjb +++ b/tests/episodes/b/src/main/resources/binding.xjb @@ -1,6 +1,6 @@ - + diff --git a/tests/episodes/pom.xml b/tests/episodes/pom.xml index 9ee67e45..268b705a 100644 --- a/tests/episodes/pom.xml +++ b/tests/episodes/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-episodes + jaxb3-basics-test-episodes pom - JAXB2 Basics - Test [episodes] + JAXB3 Basics - Test [episodes] a b diff --git a/tests/ignoring/pom.xml b/tests/ignoring/pom.xml index dfa8c281..7d30b030 100644 --- a/tests/ignoring/pom.xml +++ b/tests/ignoring/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-ignoring + jaxb3-basics-test-ignoring jar - JAXB2 Basics - Test [ignoring] + JAXB3 Basics - Test [ignoring] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -27,8 +27,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/ignoring/src/main/resources/schema.xsd b/tests/ignoring/src/main/resources/schema.xsd index fadf2bdf..341ea99a 100644 --- a/tests/ignoring/src/main/resources/schema.xsd +++ b/tests/ignoring/src/main/resources/schema.xsd @@ -1,13 +1,13 @@ diff --git a/tests/issues/pom.xml b/tests/issues/pom.xml index d8fdf0eb..13639f00 100644 --- a/tests/issues/pom.xml +++ b/tests/issues/pom.xml @@ -3,50 +3,50 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-issues + jaxb3-basics-test-issues jar - JAXB2 Basics - Test [issues] + JAXB3 Basics - Test [issues] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true -XtoString -Xequals - -Xequals-equalsStrategyClass=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB42EqualsStrategy + -Xequals-equalsStrategyClass=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB42EqualsStrategy -XhashCode -Xcopyable -Xmergeable - -Xmergeable-mergeStrategyClass=org.jvnet.jaxb2_commons.lang.JAXBMergeStrategy + -Xmergeable-mergeStrategyClass=org.jvnet.jaxb3_commons.lang.JAXBMergeStrategy -Xinheritance -Xsetters -Xsetters-mode=direct -Xwildcard -XautoInheritance - -XautoInheritance-xmlRootElementsExtend=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseClass - -XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceOne - -XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceTwo - -XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceThree - -XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceFour + -XautoInheritance-xmlRootElementsExtend=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseClass + -XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceOne + -XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceTwo + -XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceThree + -XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceFour -XenumValue -Xcustomizations -Xcustomizations-directory=${basedir}/src/main/resources @@ -54,8 +54,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueGH70Interface.java b/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueGH70Interface.java deleted file mode 100644 index 06d3ba20..00000000 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueGH70Interface.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jvnet.jaxb2_commons.tests.issues; - -public interface IssueGH70Interface { -} diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseClass.java b/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseClass.java deleted file mode 100644 index 35f45148..00000000 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.tests.issues; - -public class IssueJIIB14BaseClass { - -} diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB53ABaseClass.java b/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB53ABaseClass.java deleted file mode 100644 index 9dc324d4..00000000 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB53ABaseClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.tests.issues; - -public class IssueJIIB53ABaseClass { - -} diff --git a/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueGH70Interface.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueGH70Interface.java new file mode 100644 index 00000000..9000d8b4 --- /dev/null +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueGH70Interface.java @@ -0,0 +1,4 @@ +package org.jvnet.jaxb3_commons.tests.issues; + +public interface IssueGH70Interface { +} diff --git a/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseClass.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseClass.java new file mode 100644 index 00000000..3ef74a33 --- /dev/null +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseClass.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.tests.issues; + +public class IssueJIIB14BaseClass { + +} diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java similarity index 53% rename from tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java rename to tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java index 6259564b..79b17e52 100644 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; public interface IssueJIIB14BaseInterfaceFour { diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java similarity index 52% rename from tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java rename to tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java index bf70dc85..399427b7 100644 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; public interface IssueJIIB14BaseInterfaceOne { diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java similarity index 53% rename from tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java rename to tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java index 404b5070..02f367fe 100644 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; public interface IssueJIIB14BaseInterfaceThree { diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java similarity index 52% rename from tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java rename to tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java index a273137b..a78038af 100644 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; public interface IssueJIIB14BaseInterfaceTwo { diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB42EqualsStrategy.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB42EqualsStrategy.java similarity index 66% rename from tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB42EqualsStrategy.java rename to tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB42EqualsStrategy.java index a9b8d3a7..e5e23863 100644 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB42EqualsStrategy.java +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB42EqualsStrategy.java @@ -1,7 +1,8 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB1Type; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class IssueJIIB42EqualsStrategy extends JAXBEqualsStrategy { diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB48Interface.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB48Interface.java similarity index 60% rename from tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB48Interface.java rename to tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB48Interface.java index 1339edc6..f2ec7744 100644 --- a/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB48Interface.java +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB48Interface.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; public interface IssueJIIB48Interface { diff --git a/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB53ABaseClass.java b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB53ABaseClass.java new file mode 100644 index 00000000..050efd06 --- /dev/null +++ b/tests/issues/src/main/java/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB53ABaseClass.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.tests.issues; + +public class IssueJIIB53ABaseClass { + +} diff --git a/tests/issues/src/main/resources/binding.xjb b/tests/issues/src/main/resources/binding.xjb index bafbbbf1..fce09d5e 100644 --- a/tests/issues/src/main/resources/binding.xjb +++ b/tests/issues/src/main/resources/binding.xjb @@ -1,10 +1,10 @@ + jaxb:version="3.0"> @@ -12,7 +12,7 @@ java.lang.Cloneable - org.jvnet.jaxb2_commons.tests.issues.IssueGH70Interface + org.jvnet.jaxb3_commons.tests.issues.IssueGH70Interface diff --git a/tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB38Type.xml b/tests/issues/src/main/resources/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB38Type.xml similarity index 61% rename from tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB38Type.xml rename to tests/issues/src/main/resources/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB38Type.xml index edff2692..10636477 100644 --- a/tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB38Type.xml +++ b/tests/issues/src/main/resources/org/jvnet/jaxb3_commons/tests/issues/IssueJIIB38Type.xml @@ -1,3 +1,3 @@ - - java.lang.Cloneable + + java.lang.Cloneable \ No newline at end of file diff --git a/tests/issues/src/main/resources/schema.xsd b/tests/issues/src/main/resources/schema.xsd index 6b0d40dc..50dba77b 100644 --- a/tests/issues/src/main/resources/schema.xsd +++ b/tests/issues/src/main/resources/schema.xsd @@ -1,15 +1,15 @@ @@ -18,12 +18,12 @@ localScoping="toplevel" fixedAttributeAsConstantProperty="true"/> - + - + java.lang.Cloneable @@ -233,7 +233,7 @@ - org.jvnet.jaxb2_commons.tests.issues.IssueJIIB48Interface<java.lang.String> + org.jvnet.jaxb3_commons.tests.issues.IssueJIIB48Interface<java.lang.String> @@ -244,7 +244,7 @@ - org.jvnet.jaxb2_commons.tests.issues.IssueJIIB53ABaseClass + org.jvnet.jaxb3_commons.tests.issues.IssueJIIB53ABaseClass @@ -255,7 +255,7 @@ - org.jvnet.jaxb2_commons.tests.issues.IssueJIIB53AType + org.jvnet.jaxb3_commons.tests.issues.IssueJIIB53AType diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/CopyableTest.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/CopyableTest.java similarity index 65% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/CopyableTest.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/CopyableTest.java index 7528a31f..45b8fca4 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/CopyableTest.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/CopyableTest.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.io.File; import org.junit.Assert; -import org.jvnet.jaxb2_commons.lang.CopyStrategy2; -import org.jvnet.jaxb2_commons.lang.EqualsStrategy; -import org.jvnet.jaxb2_commons.lang.ExtendedJAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.CopyStrategy2; +import org.jvnet.jaxb3_commons.lang.EqualsStrategy; +import org.jvnet.jaxb3_commons.lang.ExtendedJAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; @SuppressWarnings("deprecation") public class CopyableTest extends AbstractSamplesTest { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH22Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH22Test.java similarity index 85% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH22Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH22Test.java index df76b87f..e9422a0b 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH22Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH22Test.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; public class GH22Test { @Test diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH26Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH26Test.java similarity index 83% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH26Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH26Test.java index a1c88cdc..aaf9d31b 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH26Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH26Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.io.File; import java.net.URL; @@ -6,14 +6,14 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.jvnet.jaxb2_commons.xjc.model.concrete.XJCCMInfoFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xjc.model.concrete.XJCCMInfoFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.ConsoleErrorReporter; @@ -55,7 +55,7 @@ public void compilesSchema() throws Exception { final MModelInfo mmodel = factory.createModel(); final MClassInfo classInfo = mmodel - .getClassInfo("org.jvnet.jaxb2_commons.tests.issues.IssueGH26Type"); + .getClassInfo("org.jvnet.jaxb3_commons.tests.issues.IssueGH26Type"); Assert.assertNotNull(classInfo); final MElementPropertyInfo a = (MElementPropertyInfo) classInfo diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH31Test.java similarity index 65% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH31Test.java index 794772cb..005db01f 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH31Test.java @@ -1,11 +1,12 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.lang.EnumValue; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; -import org.jvnet.jaxb2_commons.lang.ToStringStrategy2; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb3_commons.tests.issues.IssueGH31ComplexType; +import org.jvnet.jaxb3_commons.lang.EnumValue; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.lang.ToStringStrategy2; +import org.jvnet.jaxb3_commons.locator.ObjectLocator; public class GH31Test { @@ -30,7 +31,7 @@ public StringBuilder append(ObjectLocator locator, }; }; Assert.assertEquals( - "org.jvnet.jaxb2_commons.tests.issues.IssueGH31ComplexType[testEnum=Male(default)]", + "org.jvnet.jaxb3_commons.tests.issues.IssueGH31ComplexType[testEnum=Male(default)]", t.append(null, new StringBuilder(), s).toString()); } } diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH37Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH37Test.java similarity index 77% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH37Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH37Test.java index 4248ed34..c8980617 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH37Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/GH37Test.java @@ -1,9 +1,10 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; -import org.jvnet.jaxb2_commons.lang.ToStringStrategy2; +import org.jvnet.jaxb3_commons.tests.issues.IssueGH37Type; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.lang.ToStringStrategy2; public class GH37Test { @@ -35,12 +36,12 @@ public boolean isUseIdentityHashCode() { }; IssueGH37Type a = new IssueGH37Type(); Assert.assertEquals( - "org.jvnet.jaxb2_commons.tests.issues.IssueGH37Type[testBoolean=true(default)]", + "org.jvnet.jaxb3_commons.tests.issues.IssueGH37Type[testBoolean=true(default)]", a.append(null, new StringBuilder(), strategy).toString()); IssueGH37Type b = new IssueGH37Type(); b.setTestBoolean(true); Assert.assertEquals( - "org.jvnet.jaxb2_commons.tests.issues.IssueGH37Type[testBoolean=true]", + "org.jvnet.jaxb3_commons.tests.issues.IssueGH37Type[testBoolean=true]", b.append(null, new StringBuilder(), strategy).toString()); } diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB10Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB10Test.java similarity index 73% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB10Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB10Test.java index c1640275..c54ed287 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB10Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB10Test.java @@ -1,12 +1,13 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.lang.reflect.Field; -import javax.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAnyElement; import junit.framework.TestCase; import org.junit.Assert; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB10Type; public class JIIB10Test extends TestCase { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB14Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB14Test.java similarity index 55% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB14Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB14Test.java index 6e82c4b0..c8304768 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB14Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB14Test.java @@ -1,8 +1,15 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import junit.framework.TestCase; import org.junit.Assert; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14Element; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14JAXBElement; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseClass; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceFour; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceOne; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceThree; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceTwo; public class JIIB14Test extends TestCase { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB20Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB20Test.java similarity index 81% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB20Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB20Test.java index 959241b7..fa1e7240 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB20Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB20Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.util.Arrays; import java.util.List; @@ -6,6 +6,7 @@ import junit.framework.TestCase; import org.junit.Assert; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB20; public class JIIB20Test extends TestCase { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB35Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB35Test.java similarity index 79% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB35Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB35Test.java index a9067978..ae122b0c 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB35Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB35Test.java @@ -1,11 +1,13 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.junit.Assert; import junit.framework.TestCase; -import org.jvnet.jaxb2_commons.lang.ContextUtils; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB35; +import org.jvnet.jaxb3_commons.tests.issues.ObjectFactory; +import org.jvnet.jaxb3_commons.lang.ContextUtils; public class JIIB35Test extends TestCase { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB36Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB36Test.java similarity index 77% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB36Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB36Test.java index 445855a4..5b8bf563 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB36Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB36Test.java @@ -1,7 +1,8 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import org.junit.Assert; import org.junit.Test; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB36; public class JIIB36Test { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB38Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB38Test.java similarity index 67% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB38Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB38Test.java index bbec7934..5abfa682 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB38Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB38Test.java @@ -1,6 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import org.junit.Assert; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB38; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB38Type; + import junit.framework.TestCase; public class JIIB38Test extends TestCase { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB8Test.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB8Test.java similarity index 76% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB8Test.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB8Test.java index c53703b5..ece094f2 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB8Test.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/JIIB8Test.java @@ -1,8 +1,10 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.util.Arrays; import org.junit.Assert; +import org.jvnet.jaxb3_commons.tests.issues.IssueJIIB8Type; + import junit.framework.TestCase; public class JIIB8Test extends TestCase { diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/RunIssuesPlugin.java similarity index 64% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/RunIssuesPlugin.java index c7271b21..e37edfe2 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/RunIssuesPlugin.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; -public class RunIssuesPlugin extends RunXJC2Mojo { +public class RunIssuesPlugin extends RunXJC3Mojo { @Override - protected void configureMojo(AbstractXJC2Mojo mojo) { + protected void configureMojo(AbstractXJC3Mojo mojo) { super.configureMojo(mojo); mojo.setExtension(true); mojo.setForceRegenerate(true); @@ -30,11 +30,11 @@ public List getArgs() { args.add("-Xsetters-mode=direct"); args.add("-Xwildcard"); args.add("-XautoInheritance"); - args.add("-XautoInheritance-xmlRootElementsExtend=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseClass"); - args.add("-XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceOne"); - args.add("-XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceTwo"); - args.add("-XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceThree"); - args.add("-XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB14BaseInterfaceFour"); + args.add("-XautoInheritance-xmlRootElementsExtend=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseClass"); + args.add("-XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceOne"); + args.add("-XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceTwo"); + args.add("-XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceThree"); + args.add("-XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb3_commons.tests.issues.IssueJIIB14BaseInterfaceFour"); args.add("-Xannotate"); return args; } diff --git a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/RunPlugins.java similarity index 92% rename from tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java rename to tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/RunPlugins.java index c5d21912..f1de3f1e 100644 --- a/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java +++ b/tests/issues/src/test/java/org/jvnet/jaxb3_commons/tests/issues/RunPlugins.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb3_commons.tests.issues; import java.io.File; import java.net.URL; diff --git a/tests/namespace/pom.xml b/tests/namespace/pom.xml new file mode 100644 index 00000000..16c1f533 --- /dev/null +++ b/tests/namespace/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT + + jaxb3-basics-test-namespace + jar + JAXB3 Basics - Test [namespace] + + + org.jvnet.jaxb + jaxb3-maven-plugin-testing + test + + + org.jvnet.jaxb3_commons + jaxb3-basics + + + + test + + + org.jvnet.jaxb + jaxb3-maven-plugin + + true + + -Xnamespace-prefix + + + + org.jvnet.jaxb3_commons + jaxb3-basics + + + + + + + diff --git a/tests/namespace/src/main/resources/a.xsd b/tests/namespace/src/main/resources/a.xsd new file mode 100644 index 00000000..51d4ee39 --- /dev/null +++ b/tests/namespace/src/main/resources/a.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/namespace/src/main/resources/b.xsd b/tests/namespace/src/main/resources/b.xsd new file mode 100644 index 00000000..0b45601e --- /dev/null +++ b/tests/namespace/src/main/resources/b.xsd @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/namespace/src/main/resources/binding.xjb b/tests/namespace/src/main/resources/binding.xjb new file mode 100644 index 00000000..a7d92fbe --- /dev/null +++ b/tests/namespace/src/main/resources/binding.xjb @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tests/namespace/src/test/java/org/jvnet/jaxb3_commons/tests/namespace/RunNamespacePlugin.java b/tests/namespace/src/test/java/org/jvnet/jaxb3_commons/tests/namespace/RunNamespacePlugin.java new file mode 100644 index 00000000..f7341f07 --- /dev/null +++ b/tests/namespace/src/test/java/org/jvnet/jaxb3_commons/tests/namespace/RunNamespacePlugin.java @@ -0,0 +1,26 @@ +package org.jvnet.jaxb3_commons.tests.namespace; + +import java.util.ArrayList; +import java.util.List; + +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; + +public class RunNamespacePlugin extends RunXJC3Mojo { + + @Override + protected void configureMojo(AbstractXJC3Mojo mojo) { + super.configureMojo(mojo); + mojo.setExtension(true); + mojo.setForceRegenerate(true); + mojo.setDebug(false); + } + + @Override + public List getArgs() { + final List args = new ArrayList(super.getArgs()); + args.add("-Xnamespace-prefix"); + return args; + } + +} diff --git a/tests/namespace/src/test/resources/log4j.properties b/tests/namespace/src/test/resources/log4j.properties new file mode 100644 index 00000000..9c985635 --- /dev/null +++ b/tests/namespace/src/test/resources/log4j.properties @@ -0,0 +1,5 @@ +log4j.rootCategory=DEBUG, stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.target=system.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n \ No newline at end of file diff --git a/tests/one/pom.xml b/tests/one/pom.xml index 9ae920d0..6862e7f6 100644 --- a/tests/one/pom.xml +++ b/tests/one/pom.xml @@ -3,30 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-one + jaxb3-basics-test-one jar - JAXB2 Basics - Test [one] + JAXB3 Basics - Test [one] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -38,8 +38,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/one/src/main/resources/binding.xjb b/tests/one/src/main/resources/binding.xjb index de18ea4f..86a97475 100644 --- a/tests/one/src/main/resources/binding.xjb +++ b/tests/one/src/main/resources/binding.xjb @@ -1,7 +1,7 @@ + adapter="jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter"/> diff --git a/tests/one/src/main/resources/schema.xsd b/tests/one/src/main/resources/schema.xsd index ab550dbd..7be60d26 100644 --- a/tests/one/src/main/resources/schema.xsd +++ b/tests/one/src/main/resources/schema.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> @@ -10,7 +10,7 @@ - + diff --git a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/CopyableTest.java similarity index 69% rename from tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java rename to tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/CopyableTest.java index 6bebb721..ed6722e3 100644 --- a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java +++ b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/CopyableTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; import org.junit.Assert; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class CopyableTest extends AbstractSamplesTest { diff --git a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/EqualsTest.java similarity index 73% rename from tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java rename to tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/EqualsTest.java index 31a9d066..0ef4dc31 100644 --- a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java +++ b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/EqualsTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/HashCodeTest.java similarity index 79% rename from tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java rename to tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/HashCodeTest.java index d80f0f17..86c6a9fa 100644 --- a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java +++ b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/HashCodeTest.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; -import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb3_commons.lang.JAXBHashCodeStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class HashCodeTest extends AbstractSamplesTest { diff --git a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/RunOnePlugin.java similarity index 68% rename from tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java rename to tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/RunOnePlugin.java index 49f55f19..5d3d4c65 100644 --- a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java +++ b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/RunOnePlugin.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.AbstractXJC3Mojo; +import org.jvnet.jaxb.test.RunXJC3Mojo; -public class RunOnePlugin extends RunXJC2Mojo { +public class RunOnePlugin extends RunXJC3Mojo { @Override - protected void configureMojo(AbstractXJC2Mojo mojo) { + protected void configureMojo(AbstractXJC3Mojo mojo) { super.configureMojo(mojo); mojo.setExtension(true); mojo.setForceRegenerate(true); diff --git a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/ToStringTest.java similarity index 69% rename from tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java rename to tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/ToStringTest.java index 30552fcd..05d6d48b 100644 --- a/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java +++ b/tests/one/src/test/java/org/jvnet/jaxb3_commons/tests/one/ToStringTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb3_commons.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBToStringStrategy; public class ToStringTest extends AbstractSamplesTest { diff --git a/tests/po/pom.xml b/tests/po/pom.xml index c9fd7fe8..38ce27dc 100644 --- a/tests/po/pom.xml +++ b/tests/po/pom.xml @@ -3,30 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests + org.jvnet.jaxb3_commons + jaxb3-basics-tests 0.11.2-SNAPSHOT - jaxb2-basics-test-po + jaxb3-basics-test-po jar - JAXB2 Basics - Test [po] + JAXB3 Basics - Test [po] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -35,8 +35,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/pom.xml b/tests/pom.xml index 60766bfd..4c6bd043 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -2,13 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - jaxb2-basics-tests + jaxb3-basics-tests pom - JAXB2 Basics - Tests + JAXB3 Basics - Tests - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT episodes @@ -22,6 +22,9 @@ superclass wildcard zj + namespace + defaultvalue + commons_lang @@ -29,16 +32,16 @@ jaxb-runtime - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime com.sun.activation - javax.activation + jakarta.activation - org.jvnet.jaxb2_commons - jaxb2-basics-testing + org.jvnet.jaxb3_commons + jaxb3-basics-testing test diff --git a/tests/simple-hashCode-equals-01/pom.xml b/tests/simple-hashCode-equals-01/pom.xml index 40630e43..3943f976 100644 --- a/tests/simple-hashCode-equals-01/pom.xml +++ b/tests/simple-hashCode-equals-01/pom.xml @@ -3,30 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-tests-simple-hashCode-equals-01 + jaxb3-basics-tests-simple-hashCode-equals-01 jar - JAXB2 Basics - Test [simple-hashCode-equals-01] + JAXB3 Basics - Test [simple-hashCode-equals-01] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -36,8 +36,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/simple-hashCode-equals-01/src/main/resources/cases.xsd b/tests/simple-hashCode-equals-01/src/main/resources/cases.xsd index 1cec9a08..08562269 100644 --- a/tests/simple-hashCode-equals-01/src/main/resources/cases.xsd +++ b/tests/simple-hashCode-equals-01/src/main/resources/cases.xsd @@ -1,7 +1,7 @@ + jaxb:version="3.0"> @@ -10,7 +10,7 @@ + name="org.jvnet.jaxb3_commons.tests.simple_hashcode_equals_01.cases" /> diff --git a/tests/simple-hashCode-equals-01/src/main/resources/customer.xjb b/tests/simple-hashCode-equals-01/src/main/resources/customer.xjb index 29583121..8d26eb20 100644 --- a/tests/simple-hashCode-equals-01/src/main/resources/customer.xjb +++ b/tests/simple-hashCode-equals-01/src/main/resources/customer.xjb @@ -1,13 +1,13 @@ @@ -17,7 +17,7 @@ generateIsSetMethod="true"> - + diff --git a/tests/superclass/b/src/main/resources/binding.xjb b/tests/superclass/b/src/main/resources/binding.xjb index d5b2a7a1..903cf74e 100644 --- a/tests/superclass/b/src/main/resources/binding.xjb +++ b/tests/superclass/b/src/main/resources/binding.xjb @@ -1,6 +1,6 @@ - + - + diff --git a/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/CopyToTest.java b/tests/superclass/b/src/test/java/org/jvnet/jaxb3_commons/test/superclass/b/tests/CopyToTest.java similarity index 80% rename from tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/CopyToTest.java rename to tests/superclass/b/src/test/java/org/jvnet/jaxb3_commons/test/superclass/b/tests/CopyToTest.java index 13c11485..c6453eac 100644 --- a/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/CopyToTest.java +++ b/tests/superclass/b/src/test/java/org/jvnet/jaxb3_commons/test/superclass/b/tests/CopyToTest.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.test.superclass.b.tests; +package org.jvnet.jaxb3_commons.test.superclass.b.tests; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.test.superclass.b.AnotherObjectType; +import org.jvnet.jaxb3_commons.test.superclass.b.AnotherObjectType; public class CopyToTest { diff --git a/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/RunPlugins.java b/tests/superclass/b/src/test/java/org/jvnet/jaxb3_commons/test/superclass/b/tests/RunPlugins.java similarity index 95% rename from tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/RunPlugins.java rename to tests/superclass/b/src/test/java/org/jvnet/jaxb3_commons/test/superclass/b/tests/RunPlugins.java index 5411e7f0..4abb18f2 100644 --- a/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/RunPlugins.java +++ b/tests/superclass/b/src/test/java/org/jvnet/jaxb3_commons/test/superclass/b/tests/RunPlugins.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.test.superclass.b.tests; +package org.jvnet.jaxb3_commons.test.superclass.b.tests; import java.io.File; import java.net.URL; diff --git a/tests/superclass/pom.xml b/tests/superclass/pom.xml index 45c0de41..7aa1c955 100644 --- a/tests/superclass/pom.xml +++ b/tests/superclass/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-superclass + jaxb3-basics-test-superclass pom - JAXB2 Basics - Test [superclass] + JAXB3 Basics - Test [superclass] a b diff --git a/tests/wildcard/pom.xml b/tests/wildcard/pom.xml index 8d8b5b50..e0c2cd5a 100644 --- a/tests/wildcard/pom.xml +++ b/tests/wildcard/pom.xml @@ -3,30 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-wildcard + jaxb3-basics-test-wildcard jar - JAXB2 Basics - Test [wildcard] + JAXB3 Basics - Test [wildcard] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb3-maven-plugin-testing test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin true @@ -34,8 +34,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/wildcard/src/main/resources/binding.xjb b/tests/wildcard/src/main/resources/binding.xjb index 610f6fb7..64aa92fc 100644 --- a/tests/wildcard/src/main/resources/binding.xjb +++ b/tests/wildcard/src/main/resources/binding.xjb @@ -1,10 +1,10 @@ + jaxb:version="3.0"> diff --git a/tests/wildcard/src/main/resources/schema.xsd b/tests/wildcard/src/main/resources/schema.xsd index 7cc30c8f..5909325a 100644 --- a/tests/wildcard/src/main/resources/schema.xsd +++ b/tests/wildcard/src/main/resources/schema.xsd @@ -1,8 +1,8 @@ diff --git a/tests/zj/pom.xml b/tests/zj/pom.xml index f8409799..01e151af 100644 --- a/tests/zj/pom.xml +++ b/tests/zj/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons - jaxb2-basics-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-tests + 3.0.0-SNAPSHOT - jaxb2-basics-test-zj + jaxb3-basics-test-zj jar - JAXB2 Basics - Test [zj] + JAXB3 Basics - Test [zj] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb3-maven-plugin -XtoString @@ -25,8 +25,8 @@ - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb3_commons + jaxb3-basics diff --git a/tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java b/tests/zj/src/test/java/org/jvnet/jaxb3_commons/tests/zj/EqualsTest.java similarity index 76% rename from tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java rename to tests/zj/src/test/java/org/jvnet/jaxb3_commons/tests/zj/EqualsTest.java index dbdcd4ca..98686319 100644 --- a/tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java +++ b/tests/zj/src/test/java/org/jvnet/jaxb3_commons/tests/zj/EqualsTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.zj; +package org.jvnet.jaxb3_commons.tests.zj; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb3_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb3_commons.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/tools/pom.xml b/tools/pom.xml index c0bdd605..094374ab 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - jaxb2-basics-tools + jaxb3-basics-tools jar - JAXB2 Basics - Tools + JAXB3 Basics - Tools - org.jvnet.jaxb2_commons - jaxb2-basics-project - 2.3.6-SNAPSHOT + org.jvnet.jaxb3_commons + jaxb3-basics-project + 3.0.0-SNAPSHOT @@ -26,8 +26,8 @@ commons-lang3 - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb3_commons + jaxb3-basics-runtime org.glassfish.jaxb @@ -41,7 +41,7 @@ com.sun.activation - javax.activation + jakarta.activation provided diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MClassOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MClassOutlineGenerator.java deleted file mode 100644 index 2fc1906b..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MClassOutlineGenerator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator; - -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; - -import com.sun.tools.xjc.model.nav.NClass; -import com.sun.tools.xjc.model.nav.NType; - -public interface MClassOutlineGenerator { - - public MClassOutline generate(MPackageOutline parent, MModelInfo modelInfo, - MClassInfo classInfo); - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MElementOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MElementOutlineGenerator.java deleted file mode 100644 index 452276c3..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MElementOutlineGenerator.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator; - -import org.jvnet.jaxb2_commons.xjc.outline.MElementOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; - -import com.sun.tools.xjc.model.nav.NClass; -import com.sun.tools.xjc.model.nav.NType; - -public interface MElementOutlineGenerator { - - public MElementOutline generate(MPackageOutline parent, - MModelInfo modelInfo, - MElementInfo elementInfo); - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumOutlineGenerator.java deleted file mode 100644 index a54c226b..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumOutlineGenerator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator; - -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; - -import com.sun.tools.xjc.model.nav.NClass; -import com.sun.tools.xjc.model.nav.NType; - -public interface MEnumOutlineGenerator { - - public MEnumOutline generate(MPackageOutline parent, - MModelInfo modelInfo, - MEnumLeafInfo enumLeafInfo); -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MObjectFactoryOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MObjectFactoryOutlineGenerator.java deleted file mode 100644 index c9a9bb3e..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MObjectFactoryOutlineGenerator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator; - -import org.jvnet.jaxb2_commons.xjc.outline.MObjectFactoryOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; - -import com.sun.tools.xjc.model.nav.NClass; -import com.sun.tools.xjc.model.nav.NType; - -public interface MObjectFactoryOutlineGenerator { - - public MObjectFactoryOutline generate(MPackageOutline parent, - MModelInfo modelInfo, MPackageInfo packageInfo); - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPackageOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPackageOutlineGenerator.java deleted file mode 100644 index 0525091e..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPackageOutlineGenerator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator; - -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; - -import com.sun.tools.xjc.model.nav.NClass; -import com.sun.tools.xjc.model.nav.NType; - -public interface MPackageOutlineGenerator { - - public MPackageOutline generate(MModelOutline parent, - MModelInfo modelInfo, MPackageInfo packageInfo); - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java deleted file mode 100644 index 2c51452a..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MClassOutlineGenerator; - -public interface ClassOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java deleted file mode 100644 index 7d2710fd..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MEnumOutlineGenerator; - -public interface EnumOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java deleted file mode 100644 index 3ef9285a..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MModelOutlineGenerator; - -public interface ModelOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java deleted file mode 100644 index 178829fd..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; - -public class DummyPropertyInfoOrigin implements MPropertyInfoOrigin { - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/PackageInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/PackageInfoOrigin.java deleted file mode 100644 index 1cee3ff9..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/PackageInfoOrigin.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; - -import com.sun.codemodel.JPackage; - -public interface PackageInfoOrigin extends MSourced { - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java b/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java deleted file mode 100644 index 08e1f79e..00000000 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; - -public class AbstractPropertyAccessorFactory { - -} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/DefaultJCMTypeVisitor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/DefaultJCMTypeVisitor.java similarity index 93% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/DefaultJCMTypeVisitor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/DefaultJCMTypeVisitor.java index 586ac649..6c370715 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/DefaultJCMTypeVisitor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/DefaultJCMTypeVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; public class DefaultJCMTypeVisitor implements JCMTypeVisitor { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMArrayClass.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMArrayClass.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMArrayClass.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMArrayClass.java index 8aa74efc..88acc5f8 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMArrayClass.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMArrayClass.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JClass; import com.sun.codemodel.JType; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMClass.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMClass.java similarity index 97% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMClass.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMClass.java index 0c0edf1c..6c2cbd5c 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMClass.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMClass.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JClass; import com.sun.codemodel.JType; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMNullType.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMNullType.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMNullType.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMNullType.java index 465e2bce..0bb8a73f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMNullType.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMNullType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JNullType; import com.sun.codemodel.JType; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMPrimitiveType.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMPrimitiveType.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMPrimitiveType.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMPrimitiveType.java index 0991abae..6ffaa566 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMPrimitiveType.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMPrimitiveType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JPrimitiveType; import com.sun.codemodel.JType; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMType.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMType.java similarity index 94% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMType.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMType.java index b2f61d78..4f2c5b56 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMType.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import org.apache.commons.lang3.Validate; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeFactory.java similarity index 97% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeFactory.java index 06563dbe..bd70f04c 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import java.text.MessageFormat; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVar.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeVar.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVar.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeVar.java index 0efef325..d2c70abf 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVar.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeVar.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JType; import com.sun.codemodel.JTypeVar; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVisitor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeVisitor.java similarity index 85% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVisitor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeVisitor.java index 885f90f3..ad99e0c5 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVisitor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; public interface JCMTypeVisitor { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeWildcard.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeWildcard.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeWildcard.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeWildcard.java index d40a1ea4..6cc1d56f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeWildcard.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JCMTypeWildcard.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JClass; import com.sun.codemodel.JType; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JConditionable.java b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JConditionable.java similarity index 80% rename from tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JConditionable.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JConditionable.java index 34f70e5a..d2153faf 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JConditionable.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/codemodel/JConditionable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb3_commons.codemodel; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractParameterizablePlugin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/plugin/AbstractParameterizablePlugin.java similarity index 97% rename from tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractParameterizablePlugin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/plugin/AbstractParameterizablePlugin.java index 558e7b19..400ab0e9 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractParameterizablePlugin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/plugin/AbstractParameterizablePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb3_commons.plugin; import java.io.IOException; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractPlugin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/plugin/AbstractPlugin.java similarity index 98% rename from tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractPlugin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/plugin/AbstractPlugin.java index fad06afb..423df387 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractPlugin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/plugin/AbstractPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb3_commons.plugin; import java.util.ArrayList; import java.util.Collection; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/plugin/spring/AbstractSpringConfigurablePlugin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/plugin/spring/AbstractSpringConfigurablePlugin.java similarity index 95% rename from tools/src/main/java/org/jvnet/jaxb2_commons/plugin/spring/AbstractSpringConfigurablePlugin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/plugin/spring/AbstractSpringConfigurablePlugin.java index 90b9016d..bf1c0acd 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/plugin/spring/AbstractSpringConfigurablePlugin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/plugin/spring/AbstractSpringConfigurablePlugin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.plugin.spring; +package org.jvnet.jaxb3_commons.plugin.spring; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/Accessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/reflection/util/Accessor.java similarity index 68% rename from tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/Accessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/reflection/util/Accessor.java index f226996d..fc01c48f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/Accessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/reflection/util/Accessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.reflection.util; +package org.jvnet.jaxb3_commons.reflection.util; public interface Accessor { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/FieldAccessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/reflection/util/FieldAccessor.java similarity index 97% rename from tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/FieldAccessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/reflection/util/FieldAccessor.java index e2898db2..d8fc9dba 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/FieldAccessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/reflection/util/FieldAccessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.reflection.util; +package org.jvnet.jaxb3_commons.reflection.util; import java.lang.reflect.Field; import java.text.MessageFormat; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/ClassOutlineProcessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/ClassOutlineProcessor.java similarity index 84% rename from tools/src/main/java/org/jvnet/jaxb2_commons/strategy/ClassOutlineProcessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/strategy/ClassOutlineProcessor.java index 31936d5b..b48bdd37 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/ClassOutlineProcessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/ClassOutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb3_commons.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.ClassOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/FieldOutlineProcessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/FieldOutlineProcessor.java similarity index 84% rename from tools/src/main/java/org/jvnet/jaxb2_commons/strategy/FieldOutlineProcessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/strategy/FieldOutlineProcessor.java index 53a4b05b..d3c9bb05 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/FieldOutlineProcessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/FieldOutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb3_commons.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/OutlineProcessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/OutlineProcessor.java similarity index 82% rename from tools/src/main/java/org/jvnet/jaxb2_commons/strategy/OutlineProcessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/strategy/OutlineProcessor.java index 84d045b4..1fb1f98b 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/OutlineProcessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/OutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb3_commons.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.Outline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/PackageOutlineProcessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/PackageOutlineProcessor.java similarity index 84% rename from tools/src/main/java/org/jvnet/jaxb2_commons/strategy/PackageOutlineProcessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/strategy/PackageOutlineProcessor.java index 0d571557..bc28d202 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/PackageOutlineProcessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/PackageOutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb3_commons.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.PackageOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/impl/DefaultOutlineProcessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/impl/DefaultOutlineProcessor.java similarity index 86% rename from tools/src/main/java/org/jvnet/jaxb2_commons/strategy/impl/DefaultOutlineProcessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/strategy/impl/DefaultOutlineProcessor.java index 1a96abe4..27a118e1 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/strategy/impl/DefaultOutlineProcessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/strategy/impl/DefaultOutlineProcessor.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.strategy.impl; +package org.jvnet.jaxb3_commons.strategy.impl; import java.util.HashMap; import java.util.Map; -import org.jvnet.jaxb2_commons.strategy.ClassOutlineProcessor; -import org.jvnet.jaxb2_commons.strategy.OutlineProcessor; +import org.jvnet.jaxb3_commons.strategy.ClassOutlineProcessor; +import org.jvnet.jaxb3_commons.strategy.OutlineProcessor; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.ClassOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/ClassUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/ClassUtils.java similarity index 98% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/ClassUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/ClassUtils.java index a4437679..d9c4305f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/ClassUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/ClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/CodeModelUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/CodeModelUtils.java similarity index 99% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/CodeModelUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/CodeModelUtils.java index cf1a8dcc..4ff60ff2 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/CodeModelUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/CodeModelUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import java.util.Iterator; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/CustomizationUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/CustomizationUtils.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/CustomizationUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/CustomizationUtils.java index f924fe0e..40dd596a 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/CustomizationUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/CustomizationUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import java.util.ArrayList; import java.util.Collection; @@ -6,12 +6,12 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.JAXBIntrospector; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBIntrospector; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldAccessorFactory.java similarity index 70% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldAccessorFactory.java index 369f881a..bc608127 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldAccessorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldAccessorUtils.java similarity index 98% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldAccessorUtils.java index d178ce92..ba53b394 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldAccessorUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JFieldVar; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldUtils.java similarity index 99% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldUtils.java index 2567c2a9..9d578bae 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/FieldUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import java.util.Collection; import java.util.HashSet; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/GeneratorContextUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/GeneratorContextUtils.java similarity index 93% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/GeneratorContextUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/GeneratorContextUtils.java index 797ec481..c54dd4e4 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/GeneratorContextUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/GeneratorContextUtils.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; -import org.jvnet.jaxb2_commons.xml.bind.ContextPathAware; +import org.jvnet.jaxb3_commons.xml.bind.ContextPathAware; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/JClassUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/JClassUtils.java similarity index 96% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/JClassUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/JClassUtils.java index 3aa723e6..56819ba1 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/JClassUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/JClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import java.util.Iterator; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/OutlineUtils.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/OutlineUtils.java similarity index 93% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/OutlineUtils.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/OutlineUtils.java index 3822f4ab..fa61375f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/OutlineUtils.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/OutlineUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; import java.util.Iterator; @@ -6,7 +6,7 @@ import com.sun.tools.xjc.outline.FieldOutline; import com.sun.tools.xjc.outline.Outline; import com.sun.tools.xjc.outline.PackageOutline; -import com.sun.xml.bind.api.impl.NameConverter; +import org.glassfish.jaxb.core.api.impl.NameConverter; public class OutlineUtils { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/util/PropertyFieldAccessorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/util/PropertyFieldAccessorFactory.java similarity index 98% rename from tools/src/main/java/org/jvnet/jaxb2_commons/util/PropertyFieldAccessorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/util/PropertyFieldAccessorFactory.java index 8c4d8b2a..53f99ec4 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/util/PropertyFieldAccessorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/util/PropertyFieldAccessorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb3_commons.util; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; import com.sun.codemodel.JBlock; import com.sun.codemodel.JConditional; diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MClassOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MClassOutlineGenerator.java new file mode 100644 index 00000000..f085e284 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MClassOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb3_commons.xjc.generator; + +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; + +import com.sun.tools.xjc.model.nav.NClass; +import com.sun.tools.xjc.model.nav.NType; + +public interface MClassOutlineGenerator { + + public MClassOutline generate(MPackageOutline parent, MModelInfo modelInfo, + MClassInfo classInfo); + +} diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MElementOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MElementOutlineGenerator.java new file mode 100644 index 00000000..8fd3e993 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MElementOutlineGenerator.java @@ -0,0 +1,17 @@ +package org.jvnet.jaxb3_commons.xjc.generator; + +import org.jvnet.jaxb3_commons.xjc.outline.MElementOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; + +import com.sun.tools.xjc.model.nav.NClass; +import com.sun.tools.xjc.model.nav.NType; + +public interface MElementOutlineGenerator { + + public MElementOutline generate(MPackageOutline parent, + MModelInfo modelInfo, + MElementInfo elementInfo); + +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumConstantOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MEnumConstantOutlineGenerator.java similarity index 50% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumConstantOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MEnumConstantOutlineGenerator.java index 727601c5..094ba427 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumConstantOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MEnumConstantOutlineGenerator.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.generator; +package org.jvnet.jaxb3_commons.xjc.generator; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumConstantOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MEnumOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MEnumOutlineGenerator.java new file mode 100644 index 00000000..43b9e060 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MEnumOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb3_commons.xjc.generator; + +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; + +import com.sun.tools.xjc.model.nav.NClass; +import com.sun.tools.xjc.model.nav.NType; + +public interface MEnumOutlineGenerator { + + public MEnumOutline generate(MPackageOutline parent, + MModelInfo modelInfo, + MEnumLeafInfo enumLeafInfo); +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MModelOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MModelOutlineGenerator.java similarity index 55% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MModelOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MModelOutlineGenerator.java index 657c2930..b3d5d27a 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MModelOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MModelOutlineGenerator.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.generator; +package org.jvnet.jaxb3_commons.xjc.generator; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MObjectFactoryOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MObjectFactoryOutlineGenerator.java new file mode 100644 index 00000000..5f16531a --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MObjectFactoryOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb3_commons.xjc.generator; + +import org.jvnet.jaxb3_commons.xjc.outline.MObjectFactoryOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; + +import com.sun.tools.xjc.model.nav.NClass; +import com.sun.tools.xjc.model.nav.NType; + +public interface MObjectFactoryOutlineGenerator { + + public MObjectFactoryOutline generate(MPackageOutline parent, + MModelInfo modelInfo, MPackageInfo packageInfo); + +} diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MPackageOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MPackageOutlineGenerator.java new file mode 100644 index 00000000..e61699a0 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MPackageOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb3_commons.xjc.generator; + +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; + +import com.sun.tools.xjc.model.nav.NClass; +import com.sun.tools.xjc.model.nav.NType; + +public interface MPackageOutlineGenerator { + + public MPackageOutline generate(MModelOutline parent, + MModelInfo modelInfo, MPackageInfo packageInfo); + +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPropertyOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MPropertyOutlineGenerator.java similarity index 50% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPropertyOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MPropertyOutlineGenerator.java index c07330ee..bf3a0f70 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPropertyOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/MPropertyOutlineGenerator.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.generator; +package org.jvnet.jaxb3_commons.xjc.generator; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java similarity index 54% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java index f395c8e3..1a5f9030 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xjc.generator.artificial; +package org.jvnet.jaxb3_commons.xjc.generator.artificial; -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMPropertyOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMPropertyOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMClassOutlineGenerator.java similarity index 74% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMClassOutlineGenerator.java index 50b2b828..ffb3dfd7 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMClassOutlineGenerator.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MClassOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMClassOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MClassOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMClassOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMElementOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMElementOutlineGenerator.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMElementOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMElementOutlineGenerator.java index 63800bbf..339e106a 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMElementOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMElementOutlineGenerator.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MElementOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MElementOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMElementOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MElementOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMElementOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.CElementInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java similarity index 75% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java index 53285ae3..ba8889d9 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumConstantOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumConstantOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMEnumConstantOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMEnumConstantOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.CEnumConstant; import com.sun.tools.xjc.model.CEnumLeafInfo; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java index faccaf04..d2e09059 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumConstantOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumConstantOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMEnumOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMEnumOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.CEnumLeafInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMModelOutlineGenerator.java similarity index 80% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMModelOutlineGenerator.java index da739589..37418e47 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMModelOutlineGenerator.java @@ -1,24 +1,24 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MClassOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.MElementOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.MModelOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.MPackageOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MElementOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMModelOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MClassOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MModelOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MElementOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMModelOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; import com.sun.tools.xjc.model.Model; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java similarity index 69% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java index 89aebe76..d818a233 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MPackageOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; import com.sun.codemodel.JPackage; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java similarity index 64% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java index c73934b0..5fdcf330 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMPropertyAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.concrete.CMPropertyOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMPropertyAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.concrete.CMPropertyOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.tools.xjc.model.CPropertyInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java new file mode 100644 index 00000000..b833b47e --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xjc.generator.concrete; + +import org.jvnet.jaxb3_commons.xjc.generator.MClassOutlineGenerator; + +public interface ClassOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java similarity index 50% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java index c8f3d734..5bb6374f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; -import org.jvnet.jaxb2_commons.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MElementOutlineGenerator; public interface ElementOutlineGeneratorFactory extends OutlineGeneratorFactory { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java similarity index 53% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java index 79419eed..802acab0 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumConstantOutlineGenerator; public interface EnumConstantOutlineGeneratorFactory extends OutlineGeneratorFactory { diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java new file mode 100644 index 00000000..132fb4ec --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xjc.generator.concrete; + +import org.jvnet.jaxb3_commons.xjc.generator.MEnumOutlineGenerator; + +public interface EnumOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java new file mode 100644 index 00000000..a83a06b8 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb3_commons.xjc.generator.concrete; + +import org.jvnet.jaxb3_commons.xjc.generator.MModelOutlineGenerator; + +public interface ModelOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/OutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/OutlineGeneratorFactory.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/OutlineGeneratorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/OutlineGeneratorFactory.java index e67d8727..05bf1d16 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/OutlineGeneratorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/OutlineGeneratorFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; import com.sun.tools.xjc.outline.Outline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java similarity index 50% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java index 30cdb06d..a3c343b8 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; -import org.jvnet.jaxb2_commons.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MPackageOutlineGenerator; public interface PackageOutlineGeneratorFactory extends OutlineGeneratorFactory { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java similarity index 51% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java index 561df08f..d61cc9ca 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb3_commons.xjc.generator.concrete; -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.MPropertyOutlineGenerator; public interface PropertyOutlineGeneratorFactory extends OutlineGeneratorFactory { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/XJCCMInfoFactory.java similarity index 86% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/XJCCMInfoFactory.java index 4a5663e1..bec7177d 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/XJCCMInfoFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete; +package org.jvnet.jaxb3_commons.xjc.model.concrete; import java.util.HashMap; import java.util.IdentityHashMap; @@ -7,36 +7,37 @@ import javax.xml.namespace.NamespaceContext; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMClassInfoOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMClassRefOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMElementInfoOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMElementOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMElementTypeRefOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMEnumConstantInfoOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMEnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMModelInfoOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMPackageInfoOrigin; -import org.jvnet.jaxb2_commons.xjc.model.concrete.origin.XJCCMPropertyInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MContainer; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMClassRef; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMInfoFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.CMPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMPackageInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPackageInfoOrigin; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.glassfish.jaxb.core.v2.model.core.TypeRef; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMClassInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMClassRefOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMElementInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMElementOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMModelInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMPackageInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.model.concrete.origin.XJCCMPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassRef; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MContainer; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMClassRef; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMInfoFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.CMPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMPackageInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPackageInfoOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; import com.sun.codemodel.JClass; import com.sun.codemodel.JPackage; @@ -65,7 +66,7 @@ import com.sun.tools.xjc.outline.Outline; import com.sun.tools.xjc.reader.xmlschema.bindinfo.BIEnum; import com.sun.tools.xjc.util.NamespaceContextAdapter; -import com.sun.xml.bind.v2.model.core.TypeRef; + import com.sun.xml.xsom.XSAttributeUse; import com.sun.xml.xsom.XSComponent; import com.sun.xml.xsom.XmlString; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java similarity index 61% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java index 885f2a9f..06b1a4c3 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.PropertyOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.PropertyOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; import com.sun.tools.xjc.outline.Outline; diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java new file mode 100644 index 00000000..fdd0af2f --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MPropertyInfoOrigin; + +public class DummyPropertyInfoOrigin implements MPropertyInfoOrigin { + +} diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/PackageInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/PackageInfoOrigin.java new file mode 100644 index 00000000..34714e37 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/PackageInfoOrigin.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; + +import org.jvnet.jaxb3_commons.xml.bind.model.MSourced; + +import com.sun.codemodel.JPackage; + +public interface PackageInfoOrigin extends MSourced { + +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java index 8de351e1..710e9b9b 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xjc.generator.MClassOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMClassOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.ClassOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMClassInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MClassOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMClassOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.ClassOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMClassInfoOrigin; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java similarity index 64% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java index c6bee8bc..9a794769 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin; +import org.jvnet.jaxb3_commons.lang.Validate; +import org.jvnet.jaxb3_commons.xml.bind.model.origin.MClassRefOrigin; import com.sun.tools.xjc.model.CClassRef; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java similarity index 75% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java index dc329ea4..6cba8c90 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xjc.generator.MElementOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMElementOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.ElementOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMElementOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.ElementOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMElementInfoOrigin; import com.sun.tools.xjc.model.CElementInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java similarity index 80% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java index bfcdc8e8..1032a7eb 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMElementOrigin; import com.sun.tools.xjc.model.CElement; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java similarity index 86% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java index 974e8a58..8ef1314a 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.FindXSElementDeclVisitor; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementTypeRefOrigin; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMElementTypeRefOrigin; import com.sun.tools.xjc.model.CElementPropertyInfo; import com.sun.tools.xjc.model.CTypeRef; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java similarity index 73% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java index 039a5193..e394b77c 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumConstantOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMEnumConstantOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.EnumConstantOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMEnumConstantInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMEnumConstantOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.EnumConstantOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMEnumConstantInfoOrigin; import com.sun.tools.xjc.model.CEnumConstant; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java index 202f9358..3cb8be41 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xjc.generator.MEnumOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMEnumOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.EnumOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMEnumLeafInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MEnumOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMEnumOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.EnumOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMEnumLeafInfoOrigin; import com.sun.tools.xjc.model.CEnumLeafInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java similarity index 68% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java index a2d17297..282c449a 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; -import org.jvnet.jaxb2_commons.xjc.generator.MModelOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMModelOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.ModelOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMModelInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MModelOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMModelOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.ModelOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMModelInfoOrigin; import com.sun.tools.xjc.model.Model; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java similarity index 67% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java index 389402d7..c3bc4c8b 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.generator.MPackageOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMPackageOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.PackageOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMPackageInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMPackageOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.PackageOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMPackageInfoOrigin; import com.sun.codemodel.JPackage; import com.sun.tools.xjc.outline.Outline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java index d4201556..f7a468fa 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb3_commons.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.CMPropertyOutlineGenerator; -import org.jvnet.jaxb2_commons.xjc.generator.concrete.PropertyOutlineGeneratorFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMPropertyInfoOrigin; +import org.jvnet.jaxb3_commons.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.CMPropertyOutlineGenerator; +import org.jvnet.jaxb3_commons.xjc.generator.concrete.PropertyOutlineGeneratorFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.concrete.origin.CMPropertyInfoOrigin; import com.sun.tools.xjc.model.CPropertyInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/FieldAccessorEx.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/FieldAccessorEx.java similarity index 81% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/FieldAccessorEx.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/FieldAccessorEx.java index 585da129..a3f3001e 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/FieldAccessorEx.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/FieldAccessorEx.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import com.sun.codemodel.JType; import com.sun.tools.xjc.outline.FieldAccessor; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MChildOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MChildOutline.java similarity index 61% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MChildOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MChildOutline.java index ca86fffe..27156961 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MChildOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MChildOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; public interface MChildOutline { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MClassOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MClassOutline.java similarity index 79% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MClassOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MClassOutline.java index 8eec678f..6dbdc7a3 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MClassOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MClassOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import java.util.List; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.codemodel.JClass; import com.sun.codemodel.JDefinedClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MElementOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MElementOutline.java similarity index 63% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MElementOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MElementOutline.java index 05761eae..86d291da 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MElementOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MElementOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumConstantOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MEnumConstantOutline.java similarity index 64% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumConstantOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MEnumConstantOutline.java index b9ec0c16..56b34b50 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumConstantOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MEnumConstantOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.codemodel.JEnumConstant; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MEnumOutline.java similarity index 69% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MEnumOutline.java index 3e0dff63..a4e01d5e 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MEnumOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import java.util.List; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MModelOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MModelOutline.java similarity index 66% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MModelOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MModelOutline.java index 19cc24de..c896698f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MModelOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MModelOutline.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import java.util.Collection; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MObjectFactoryOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MObjectFactoryOutline.java similarity index 77% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MObjectFactoryOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MObjectFactoryOutline.java index 3fe33a1b..56ef0bb9 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MObjectFactoryOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MObjectFactoryOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import com.sun.codemodel.JDefinedClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackageOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPackageOutline.java similarity index 73% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackageOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPackageOutline.java index dac3cb5f..dede7bc9 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackageOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPackageOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import java.util.Collection; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.codemodel.JPackage; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackagedOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPackagedOutline.java similarity index 65% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackagedOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPackagedOutline.java index 83c2ab96..3cee2054 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackagedOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPackagedOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; public interface MPackagedOutline { diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyAccessor.java similarity index 90% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyAccessor.java index f090d433..eb93ebac 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyAccessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyAccessorFactory.java similarity index 77% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyAccessorFactory.java index 00586f7c..b7e2e16f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyAccessorFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; import com.sun.codemodel.JExpression; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyOutline.java similarity index 60% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyOutline.java index 144ca02d..0686347b 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/MPropertyOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb3_commons.xjc.outline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTargeted; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java new file mode 100644 index 00000000..0f55f908 --- /dev/null +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb3_commons.xjc.outline.artificial; + +public class AbstractPropertyAccessorFactory { + +} diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractPropertyOutline.java similarity index 92% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractPropertyOutline.java index c5c970be..73e17a69 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractPropertyOutline.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java similarity index 91% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java index 3fbdbd0d..c4dc5064 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java similarity index 73% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java index b52af2b8..02152ab0 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java @@ -1,19 +1,19 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MValuePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MValuePropertyInfo; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JAnnotationUse; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java similarity index 91% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java index e6893f94..bc0f063c 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyAttributePropertyInfo; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JBlock; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/ConstantPropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/ConstantPropertyOutline.java similarity index 85% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/ConstantPropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/ConstantPropertyOutline.java index e01f8bea..52a5c20f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/ConstantPropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/ConstantPropertyOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpr; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/PropertyTypeVisitor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/PropertyTypeVisitor.java similarity index 71% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/PropertyTypeVisitor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/PropertyTypeVisitor.java index 8dc193e8..ae1c0c75 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/PropertyTypeVisitor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/PropertyTypeVisitor.java @@ -1,20 +1,20 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; import java.util.Map; import javax.xml.namespace.QName; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAnyElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfoVisitor; -import org.jvnet.jaxb2_commons.xml.bind.model.MValuePropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb3_commons.xml.bind.model.MValuePropertyInfo; import com.sun.codemodel.JType; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/SinglePropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/SinglePropertyOutline.java similarity index 85% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/SinglePropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/SinglePropertyOutline.java index d7502add..b3d14043 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/SinglePropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/artificial/SinglePropertyOutline.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb3_commons.xjc.outline.artificial; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpr; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMClassOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMClassOutline.java similarity index 89% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMClassOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMClassOutline.java index 931a1e8d..f8c8774f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMClassOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMClassOutline.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; import com.sun.codemodel.JClass; import com.sun.codemodel.JDefinedClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMElementOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMElementOutline.java similarity index 77% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMElementOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMElementOutline.java index d11b4a14..913bbbc3 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMElementOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMElementOutline.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MElementOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MElementOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumConstantOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMEnumConstantOutline.java similarity index 78% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumConstantOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMEnumConstantOutline.java index 037ede4c..b7d62ad6 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumConstantOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMEnumConstantOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumConstantOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumConstantInfo; import com.sun.codemodel.JEnumConstant; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMEnumOutline.java similarity index 82% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMEnumOutline.java index d7506c19..3528318f 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMEnumOutline.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumConstantOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMModelOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMModelOutline.java similarity index 85% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMModelOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMModelOutline.java index 45b57606..505ade39 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMModelOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMModelOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import java.util.ArrayList; import java.util.Collection; @@ -8,16 +8,16 @@ import java.util.Map; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MElementOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumLeafInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MElementOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMObjectFactoryOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMObjectFactoryOutline.java similarity index 76% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMObjectFactoryOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMObjectFactoryOutline.java index fec82a70..5329130d 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMObjectFactoryOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMObjectFactoryOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MObjectFactoryOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MObjectFactoryOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; import com.sun.codemodel.JDefinedClass; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPackageOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPackageOutline.java similarity index 84% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPackageOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPackageOutline.java index ce8edc55..2990aa5d 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPackageOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPackageOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import java.util.ArrayList; import java.util.Collection; @@ -6,13 +6,13 @@ import java.util.List; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MElementOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MEnumOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MObjectFactoryOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPackageOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MElementOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MEnumOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MModelOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MObjectFactoryOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPackageOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MPackageInfo; import com.sun.codemodel.JPackage; import com.sun.tools.xjc.outline.PackageOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessor.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyAccessor.java similarity index 85% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessor.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyAccessor.java index 66ea82ba..1d830c14 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessor.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyAccessor.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java similarity index 73% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java index 65208cf6..e182fb14 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.util.FieldAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb3_commons.util.FieldAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessorFactory; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyOutline.java b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyOutline.java similarity index 74% rename from tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyOutline.java rename to tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyOutline.java index 4831106b..43c327fe 100644 --- a/tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyOutline.java +++ b/tools/src/main/java/org/jvnet/jaxb3_commons/xjc/outline/concrete/CMPropertyOutline.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb3_commons.xjc.outline.concrete; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessor; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyAccessorFactory; -import org.jvnet.jaxb2_commons.xjc.outline.MPropertyOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb3_commons.xjc.outline.MClassOutline; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb3_commons.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb3_commons.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.model.nav.NClass; diff --git a/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/package-info.java b/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/package-info.java deleted file mode 100644 index 337e5fa8..00000000 --- a/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "urn:test", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @XmlNs(namespaceURI = "urn:test", prefix = "test") }) -package org.jvnet.jaxb2_commons.xjc.model.concrete.tests.ahpla; - -import javax.xml.bind.annotation.XmlNs; - diff --git a/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java b/tools/src/test/java/org/jvnet/jaxb3_commons/reflection/util/test/FieldAccessorTest.java similarity index 76% rename from tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java rename to tools/src/test/java/org/jvnet/jaxb3_commons/reflection/util/test/FieldAccessorTest.java index 1a258226..634fa77c 100644 --- a/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java +++ b/tools/src/test/java/org/jvnet/jaxb3_commons/reflection/util/test/FieldAccessorTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.reflection.util.test; +package org.jvnet.jaxb3_commons.reflection.util.test; import java.net.URI; import java.net.URISyntaxException; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.reflection.util.Accessor; -import org.jvnet.jaxb2_commons.reflection.util.FieldAccessor; +import org.jvnet.jaxb3_commons.reflection.util.Accessor; +import org.jvnet.jaxb3_commons.reflection.util.FieldAccessor; public class FieldAccessorTest { diff --git a/tools/src/test/java/org/jvnet/jaxb2_commons/util/tests/JClassUtilsTest.java b/tools/src/test/java/org/jvnet/jaxb3_commons/util/tests/JClassUtilsTest.java similarity index 93% rename from tools/src/test/java/org/jvnet/jaxb2_commons/util/tests/JClassUtilsTest.java rename to tools/src/test/java/org/jvnet/jaxb3_commons/util/tests/JClassUtilsTest.java index c7120bc5..a3fd39a3 100644 --- a/tools/src/test/java/org/jvnet/jaxb2_commons/util/tests/JClassUtilsTest.java +++ b/tools/src/test/java/org/jvnet/jaxb3_commons/util/tests/JClassUtilsTest.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.util.tests; +package org.jvnet.jaxb3_commons.util.tests; import java.io.Externalizable; import java.util.Collection; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.util.JClassUtils; +import org.jvnet.jaxb3_commons.util.JClassUtils; import com.sun.codemodel.JClass; import com.sun.codemodel.JClassAlreadyExistsException; diff --git a/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java b/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java similarity index 58% rename from tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java rename to tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java index 13f123a3..d0aa0ff1 100644 --- a/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java +++ b/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.tests.ahpla; +package org.jvnet.jaxb3_commons.xjc.model.concrete.tests.ahpla; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "KnownReferencedType", propOrder = { "str" }) diff --git a/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/ahpla/package-info.java b/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/ahpla/package-info.java new file mode 100644 index 00000000..9e882447 --- /dev/null +++ b/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/ahpla/package-info.java @@ -0,0 +1,5 @@ +@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:test", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @XmlNs(namespaceURI = "urn:test", prefix = "test") }) +package org.jvnet.jaxb3_commons.xjc.model.concrete.tests.ahpla; + +import jakarta.xml.bind.annotation.XmlNs; + diff --git a/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java b/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java similarity index 87% rename from tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java rename to tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java index 2398bdec..17e2a301 100644 --- a/tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java +++ b/tools/src/test/java/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.tests.alpha; +package org.jvnet.jaxb3_commons.xjc.model.concrete.tests.alpha; import java.io.File; import java.io.IOException; @@ -9,13 +9,13 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.jvnet.jaxb2_commons.xjc.model.concrete.XJCCMInfoFactory; -import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo; -import org.jvnet.jaxb2_commons.xml.namespace.util.QNameUtils; -import org.jvnet.jaxb2_commons.xmlschema.XmlSchemaConstants; +import org.jvnet.jaxb3_commons.xjc.model.concrete.XJCCMInfoFactory; +import org.jvnet.jaxb3_commons.xml.bind.model.MClassInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MElementInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb3_commons.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb3_commons.xml.namespace.util.QNameUtils; +import org.jvnet.jaxb3_commons.xmlschema.XmlSchemaConstants; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.BadCommandLineException; diff --git a/tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/binding.xjb b/tools/src/test/resources/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/binding.xjb similarity index 82% rename from tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/binding.xjb rename to tools/src/test/resources/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/binding.xjb index 134f529b..110f3b0a 100644 --- a/tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/binding.xjb +++ b/tools/src/test/resources/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/binding.xjb @@ -1,4 +1,4 @@ - diff --git a/tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/schema.xsd b/tools/src/test/resources/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/schema.xsd similarity index 94% rename from tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/schema.xsd rename to tools/src/test/resources/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/schema.xsd index 3ff9641c..a8e09573 100644 --- a/tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/schema.xsd +++ b/tools/src/test/resources/org/jvnet/jaxb3_commons/xjc/model/concrete/tests/alpha/schema.xsd @@ -1,6 +1,6 @@ @@ -9,7 +9,7 @@ + name="org.jvnet.jaxb3_commons.xjc.model.concrete.tests.alpha" /> @@ -44,7 +44,7 @@ + ref="org.jvnet.jaxb3_commons.xjc.model.concrete.tests.ahpla.KnownReferencedType" /> @@ -58,7 +58,7 @@ + ref="org.jvnet.jaxb3_commons.xjc.model.concrete.tests.ahpla.UnknownReferencedType" />